summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-03 15:27:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-13 14:57:38 +0200
commitc67873216bb476935a753c3597ba91d8029f307b (patch)
treee77ccd3055ed11ebe261357fadc0dbfd5c727da4 /recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch
parent671313d0b5e09e0b49a90ed944cd33fb3d6457b0 (diff)
downloadmeta-qt5-c67873216bb476935a753c3597ba91d8029f307b.tar.gz
recipes-qt5: Drop 5.0.2 version and 2nd qtwayland recipe
* this will make maintaining meta-qt5 a bit easier Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch
deleted file mode 100644
index d824eed1..00000000
--- a/recipes-qt/qt5/qtbase-5.0.2/0015-qtbase-allow-build-of-examples.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From a21c676a69388cd8cdf0bb28184de2bee58def0e 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 15/22] 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 | 8 --------
28 1 file changed, 8 deletions(-)
29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 479a16a..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,12 +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- # Do not actually build the examples in production builds with -prefix
40- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
41- TEMPLATE = aux
42- CONFIG -= have_target qt staticlib dll
43- SOURCES =
44- INSTALLS -= target
45- }
46 }
47--
481.8.3.2
49