diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-15 13:07:11 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-13 08:18:45 +0000 |
commit | fc91b16ed2a877412cd3a67023a6217e8671c3e4 (patch) | |
tree | 79e0af3098fc82423d36bfc25176f2b85f2607b3 /recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch | |
parent | e088f366191f9a4cadc815c3d72d85086619a184 (diff) | |
download | meta-qt5-fc91b16ed2a877412cd3a67023a6217e8671c3e4.tar.gz |
qt5: Add mingw support
Change-Id: Ibd6449396be71761e10c84bdb9a9b1888affc618
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch new file mode 100644 index 00000000..9884976d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From 34676aae2d06271014ee4a67498e6e2f0fe97139 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Fri, 11 Mar 2016 16:00:23 +0200 | ||
4 | Subject: [PATCH] configure: Separate host and build platform | ||
5 | |||
6 | Missing bits that were not upstreamed | ||
7 | |||
8 | Change-Id: I6bfed072c9826094dcda9c7112b0c8b9d4055366 | ||
9 | --- | ||
10 | configure | 2 +- | ||
11 | mkspecs/features/qt_functions.prf | 2 +- | ||
12 | mkspecs/features/qt_tool.prf | 1 + | ||
13 | 3 files changed, 3 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 03e89d5..2fa97d3 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -3293,7 +3293,7 @@ if [ -d "$XPLATFORM" ]; then | ||
20 | else | ||
21 | XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" | ||
22 | fi | ||
23 | -if [ "$PLATFORM" != "$XPLATFORM" ]; then | ||
24 | +if [ "$PLATFORM" != "$XPLATFORM" ] || [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then | ||
25 | QT_CROSS_COMPILE=yes | ||
26 | QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" | ||
27 | QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" | ||
28 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | ||
29 | index 9c3414c..91d1888 100644 | ||
30 | --- a/mkspecs/features/qt_functions.prf | ||
31 | +++ b/mkspecs/features/qt_functions.prf | ||
32 | @@ -71,7 +71,7 @@ defineTest(qtHaveModule) { | ||
33 | defineTest(qtPrepareTool) { | ||
34 | cmd = $$eval(QT_TOOL.$${2}.binary) | ||
35 | isEmpty(cmd) { | ||
36 | - cmd = $$[QT_HOST_BINS]/$$2 | ||
37 | + cmd = $$[QT_HOST_BINS/get]/$$2 | ||
38 | exists($${cmd}.pl) { | ||
39 | cmd = perl -w $$system_path($${cmd}.pl) | ||
40 | } else: contains(QMAKE_HOST.os, Windows) { | ||
41 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | ||
42 | index bdeb59c..ecc0ca2 100644 | ||
43 | --- a/mkspecs/features/qt_tool.prf | ||
44 | +++ b/mkspecs/features/qt_tool.prf | ||
45 | @@ -21,6 +21,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER | ||
46 | isEmpty(MODULE):MODULE = $$TARGET | ||
47 | |||
48 | load(qt_build_paths) | ||
49 | + load(device_config) | ||
50 | |||
51 | TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri | ||
52 | |||
53 | -- | ||
54 | 1.9.1 | ||
55 | |||