summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-24 21:02:34 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-03-05 19:31:03 +0100
commita036792a6270f18c971baeb72f92abbb91c4d73e (patch)
tree93c5787c44dcb0ecebd1b4f9fedf1fcabf7ac941 /recipes-qt/qt5/qtbase
parentfc06fb8ceb8eec4fe64463234ce6aaadd5f8a852 (diff)
downloadmeta-qt5-a036792a6270f18c971baeb72f92abbb91c4d73e.tar.gz
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch
deleted file mode 100644
index 9d46d2fb..00000000
--- a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 12/14] qtbase: allow build of examples
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this revert the following commit :
10
11commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Fri Dec 21 19:36:12 2012 +0100
14
15 do not actually build examples in production builds
16
17 -developer-build enables an actual build of examples, based on the
18 assumption that developers want to test it (it can be still disabled
19 with -nomake examples). regular users otoh want only the examples
20 sources installed.
21
22 Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
24
25Signed-off-by: Eric BĂ©nard <eric@eukrea.com>
26---
27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 7 deletions(-)
29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 }
38-
39- !equals(TEMPLATE, subdirs):!compile_examples {
40- TEMPLATE = aux
41- CONFIG -= have_target qt staticlib dll
42- SOURCES =
43- INSTALLS -= target
44- }
45 }
46--
471.8.5.3
48