summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-07-20 15:13:32 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-07-25 12:14:12 +0200
commit507c7466ea3a7b10a72b57ce06c3bf1ddd769037 (patch)
treedfae928f81887550f603b11d0a36993b20d96394 /recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
parent902f55b957ba0407816739bfcae864c6bd2c3d68 (diff)
downloadmeta-qt5-507c7466ea3a7b10a72b57ce06c3bf1ddd769037.tar.gz
qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
index 45a49a62..9cf06419 100644
--- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
+++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
@@ -1,7 +1,7 @@
1From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 1From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200 3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/15] qtbase: allow build of examples 4Subject: [PATCH 15/23] qtbase: allow build of examples
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -24,20 +24,19 @@ Date: Fri Dec 21 19:36:12 2012 +0100
24 24
25Signed-off-by: Eric Bénard <eric@eukrea.com> 25Signed-off-by: Eric Bénard <eric@eukrea.com>
26--- 26---
27 mkspecs/features/qt_example_installs.prf | 8 -------- 27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 8 deletions(-) 28 1 file changed, 7 deletions(-)
29 29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf 30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 479a16a..ca1b0c7 100644 31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf 32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/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) 34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc 35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") 36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 } 37 }
38- 38-
39- # Do not actually build the examples in production builds with -prefix 39- !equals(TEMPLATE, subdirs):!compile_examples {
40- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
41- TEMPLATE = aux 40- TEMPLATE = aux
42- CONFIG -= have_target qt staticlib dll 41- CONFIG -= have_target qt staticlib dll
43- SOURCES = 42- SOURCES =
@@ -45,5 +44,5 @@ index 479a16a..ca1b0c7 100644
45- } 44- }
46 } 45 }
47-- 46--
481.8.2.1 471.8.3.2
49 48