summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
diff options
context:
space:
mode:
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.patch51
1 files changed, 51 insertions, 0 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
new file mode 100644
index 00000000..6e694544
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -0,0 +1,51 @@
1From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check
5
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 -
8 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 mkspecs/features/qt_functions.prf | 6 +++++-
15 mkspecs/features/qt_tool.prf | 3 +--
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index 876f657..0e094a8 100644
20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf
22@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.command)
24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
27+ # for some reason isEmpty does not work here, FIXME before submitting upstream
28+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
29+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
30+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2
33 }
34 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index c110ea5..34ee9ca 100644
37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console
40
41 # If we are doing a prefix build, create a "module" pri which enables
42 # qtPrepareTool() to work with the non-installed build.
43-# Non-bootstrapped tools always need this because of the environment setup.
44-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET
47
48 MODULE_DEPENDS = $$replace(QT, -private$, )
49--
501.8.2.1
51