48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
From 6d1c296d6df2c5efd8aec3272e7eacae1c093885 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 6/6] qt_functions: temporary remove isEmpty check
|
|
|
|
* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
|
|
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
---
|
|
mkspecs/features/qt_functions.prf | 6 +++++-
|
|
mkspecs/features/qt_tool.prf | 3 +--
|
|
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
|
|
--- a/mkspecs/features/qt_functions.prf
|
|
+++ b/mkspecs/features/qt_functions.prf
|
|
@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) {
|
|
$$1 = $$eval(QT_TOOL.$${2}.command)
|
|
isEmpty($$1) {
|
|
$$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
|
|
- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
|
+ # for some reason isEmpty does not work here, FIXME before submitting upstream
|
|
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
|
|
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
|
|
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
|
|
+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
|
|
$$1 = $$[QT_HOST_BINS]/$$2
|
|
}
|
|
contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
|
|
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
|
|
index 5758604..37b50d4 100644
|
|
--- a/mkspecs/features/qt_tool.prf
|
|
+++ b/mkspecs/features/qt_tool.prf
|
|
@@ -36,8 +36,7 @@ load(qt_common)
|
|
|
|
# If we are doing a prefix build, create a "module" pri which enables
|
|
# qtPrepareTool() to work with the non-installed build.
|
|
-# Non-bootstrapped tools always need this because of the environment setup.
|
|
-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
|
+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
|
|
isEmpty(MODULE):MODULE = $$TARGET
|
|
|
|
MODULE_DEPENDS = $$replace(QT, -private$, )
|
|
--
|
|
1.8.2.1
|
|
|