qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with -compile-examples option
* -compile-examples option was added in upstream commit: commit 8ea19caacf281240411541b5af37c2f9a103a7d1 Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Tue May 7 17:10:22 2013 +0200 Subject: add -compile-examples configure option Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
fc06fb8ceb
commit
a036792a62
|
@ -16,7 +16,6 @@ SRC_URI += "\
|
||||||
SRC_URI += "\
|
SRC_URI += "\
|
||||||
file://0010-qmake-is-already-built-in-qtbase-native.patch \
|
file://0010-qmake-is-already-built-in-qtbase-native.patch \
|
||||||
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
|
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||||
file://0012-qtbase-allow-build-of-examples.patch \
|
|
||||||
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
|
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
|
||||||
file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
|
file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
|
||||||
file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \
|
file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \
|
||||||
|
@ -65,7 +64,7 @@ PACKAGECONFIG[release] = "-release,-debug"
|
||||||
PACKAGECONFIG[developer] = "-developer-build"
|
PACKAGECONFIG[developer] = "-developer-build"
|
||||||
PACKAGECONFIG[sm] = "-sm,-no-sm"
|
PACKAGECONFIG[sm] = "-sm,-no-sm"
|
||||||
PACKAGECONFIG[tests] = "-make tests,-nomake tests"
|
PACKAGECONFIG[tests] = "-make tests,-nomake tests"
|
||||||
PACKAGECONFIG[examples] = "-make examples,-nomake examples"
|
PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples"
|
||||||
PACKAGECONFIG[tools] = "-make tools,-nomake tools"
|
PACKAGECONFIG[tools] = "-make tools,-nomake tools"
|
||||||
# only for completeness, configure will add libs even if you try to explicitly remove it
|
# only for completeness, configure will add libs even if you try to explicitly remove it
|
||||||
PACKAGECONFIG[libs] = "-make libs,-nomake libs"
|
PACKAGECONFIG[libs] = "-make libs,-nomake libs"
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
|
||||||
Date: Sat, 25 May 2013 17:34:32 +0200
|
|
||||||
Subject: [PATCH 12/14] qtbase: allow build of examples
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
this revert the following commit :
|
|
||||||
|
|
||||||
commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
|
|
||||||
Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
||||||
Date: Fri Dec 21 19:36:12 2012 +0100
|
|
||||||
|
|
||||||
do not actually build examples in production builds
|
|
||||||
|
|
||||||
-developer-build enables an actual build of examples, based on the
|
|
||||||
assumption that developers want to test it (it can be still disabled
|
|
||||||
with -nomake examples). regular users otoh want only the examples
|
|
||||||
sources installed.
|
|
||||||
|
|
||||||
Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
|
|
||||||
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
||||||
|
|
||||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
|
||||||
---
|
|
||||||
mkspecs/features/qt_example_installs.prf | 7 -------
|
|
||||||
1 file changed, 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
|
|
||||||
index 2db752c..ca1b0c7 100644
|
|
||||||
--- a/mkspecs/features/qt_example_installs.prf
|
|
||||||
+++ b/mkspecs/features/qt_example_installs.prf
|
|
||||||
@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
|
||||||
allfiles -= doc
|
|
||||||
!isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- !equals(TEMPLATE, subdirs):!compile_examples {
|
|
||||||
- TEMPLATE = aux
|
|
||||||
- CONFIG -= have_target qt staticlib dll
|
|
||||||
- SOURCES =
|
|
||||||
- INSTALLS -= target
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.5.3
|
|
||||||
|
|
Loading…
Reference in New Issue