summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 22:16:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 22:22:05 +0200
commit35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch)
treed640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
parent81b7031859176f24c028c7234d795812bd1a3c95 (diff)
downloadmeta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
deleted file mode 100644
index a2b1e5e8..00000000
--- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From e356895802c2a1e596882c79161994ebbf361d65 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 06/11] qt_functions: temporary remove isEmpty check
5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 mkspecs/features/qt_functions.prf | 6 +++++-
11 mkspecs/features/qt_tool.prf | 3 +--
12 2 files changed, 6 insertions(+), 3 deletions(-)
13
14diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
15index 876f657..0e094a8 100644
16--- a/mkspecs/features/qt_functions.prf
17+++ b/mkspecs/features/qt_functions.prf
18@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) {
19 $$1 = $$eval(QT_TOOL.$${2}.command)
20 isEmpty($$1) {
21 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
22- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
23+ # for some reason isEmpty does not work here, FIXME before submitting upstream
24+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
25+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
26+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
27+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
28 $$1 = $$[QT_HOST_BINS]/$$2
29 }
30 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
31diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
32index c110ea5..34ee9ca 100644
33--- a/mkspecs/features/qt_tool.prf
34+++ b/mkspecs/features/qt_tool.prf
35@@ -15,8 +15,7 @@ CONFIG += console
36
37 # If we are doing a prefix build, create a "module" pri which enables
38 # qtPrepareTool() to work with the non-installed build.
39-# Non-bootstrapped tools always need this because of the environment setup.
40-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
41+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
42 isEmpty(MODULE):MODULE = $$TARGET
43
44 MODULE_DEPENDS = $$replace(QT, -private$, )
45--
461.8.2.1
47