summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.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/0004-qt_functions-temporary-remove-isEmpty-check.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/0004-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
index 77b1c41f..ccb8a093 100644
--- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,7 +1,7 @@
1From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 1From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200 3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check 4Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check
5 5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value 6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7* isEmpty works correctly only with qmake variables (e.g. $$FOO - 7* isEmpty works correctly only with qmake variables (e.g. $$FOO -
@@ -16,11 +16,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 6 insertions(+), 3 deletions(-) 16 2 files changed, 6 insertions(+), 3 deletions(-)
17 17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index 876f657..0e094a8 100644 19index 4e12d3d..e20ad9d 100644
20--- a/mkspecs/features/qt_functions.prf 20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf 21+++ b/mkspecs/features/qt_functions.prf
22@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { 22@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.command) 23 $$1 = $$eval(QT_TOOL.$${2}.binary)
24 isEmpty($$1) { 24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
@@ -31,9 +31,9 @@ index 876f657..0e094a8 100644
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { 31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2 32 $$1 = $$[QT_HOST_BINS]/$$2
33 } 33 }
34 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { 34 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index c110ea5..34ee9ca 100644 36index 83ef3a0..21c9eb7 100644
37--- a/mkspecs/features/qt_tool.prf 37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf 38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console 39@@ -15,8 +15,7 @@ CONFIG += console
@@ -45,7 +45,7 @@ index c110ea5..34ee9ca 100644
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { 45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET 46 isEmpty(MODULE):MODULE = $$TARGET
47 47
48 MODULE_DEPENDS = $$replace(QT, -private$, ) 48 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49-- 49--
501.8.2.1 501.8.3.2
51 51