diff options
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.patch | 18 |
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 @@ -From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 +From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value * isEmpty works correctly only with qmake variables (e.g. $$FOO - @@ -16,11 +16,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 +index 4e12d3d..e20ad9d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 - isEmpty($$[QT_EXTERNAL_HOST_BINS]) { @@ -31,9 +31,9 @@ index 876f657..0e094a8 100644 + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { $$1 = $$[QT_HOST_BINS]/$$2 } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).pl) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index c110ea5..34ee9ca 100644 +index 83ef3a0..21c9eb7 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -15,8 +15,7 @@ CONFIG += console @@ -45,7 +45,7 @@ index c110ea5..34ee9ca 100644 +!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) -- -1.8.2.1 +1.8.3.2 |