blob: 9884976da869971d5c39a3d65b59f3b1d22f01e4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 34676aae2d06271014ee4a67498e6e2f0fe97139 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Fri, 11 Mar 2016 16:00:23 +0200
Subject: [PATCH] configure: Separate host and build platform
Missing bits that were not upstreamed
Change-Id: I6bfed072c9826094dcda9c7112b0c8b9d4055366
---
configure | 2 +-
mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_tool.prf | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 03e89d5..2fa97d3 100755
--- a/configure
+++ b/configure
@@ -3293,7 +3293,7 @@ if [ -d "$XPLATFORM" ]; then
else
XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
fi
-if [ "$PLATFORM" != "$XPLATFORM" ]; then
+if [ "$PLATFORM" != "$XPLATFORM" ] || [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
QT_CROSS_COMPILE=yes
QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 9c3414c..91d1888 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -71,7 +71,7 @@ defineTest(qtHaveModule) {
defineTest(qtPrepareTool) {
cmd = $$eval(QT_TOOL.$${2}.binary)
isEmpty(cmd) {
- cmd = $$[QT_HOST_BINS]/$$2
+ cmd = $$[QT_HOST_BINS/get]/$$2
exists($${cmd}.pl) {
cmd = perl -w $$system_path($${cmd}.pl)
} else: contains(QMAKE_HOST.os, Windows) {
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
index bdeb59c..ecc0ca2 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -21,6 +21,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER
isEmpty(MODULE):MODULE = $$TARGET
load(qt_build_paths)
+ load(device_config)
TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri
--
1.9.1
|
