summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-07-03 16:14:44 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-07-25 12:14:11 +0200
commit902f55b957ba0407816739bfcae864c6bd2c3d68 (patch)
tree220ada24d4edd83938e8eceaf24b91ad81ff5231 /recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
parentca4a0758e17c69905df6eda86fe678a4f10f50f7 (diff)
downloadmeta-qt5-902f55b957ba0407816739bfcae864c6bd2c3d68.tar.gz
qt5: add recipes for 5.1.0
* only rebased patches and updated SRC_URI checksum, haven't even build tested it yet Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
new file mode 100644
index 00000000..4fe10871
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.1.0/0004-qt_functions-temporary-remove-isEmpty-check.patch
@@ -0,0 +1,51 @@
1From ad252e21f737536027aebbf63217188a80d108ba 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/23] 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 d581367..2bc6533 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}.binary)
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 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index 83ef3a0..21c9eb7 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 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49--
501.8.3.2
51