diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-03 14:27:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-06 10:44:49 +0200 |
| commit | ceaa9ecc67a9ebb83ce735a24c6061df3dd8c489 (patch) | |
| tree | 30aa9865fa14b9fa852e818ea8ddea937928a740 | |
| parent | d41aa87d6b1164666c9f013a785bc6217ae1ced2 (diff) | |
Fix crossbuilding QtWebKit from Windowsv5.4.0-alpha1
A number of checks needed for the building process was checking the
target instead of the host environment, making them fail to work when
crossbuilding from windows to a non-windows target.
Change-Id: Iba61016471a6fadf8fc34012f4a323bc7264c945
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 79b64547a..e07d5e47d 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -91,7 +91,7 @@ contains(TEMPLATE, derived) { # on Linux and Mac OS X. On Windows we do have a convenience copy in # Qt5's top-level repository, so let's add that to the PATH if we can # find it. - win32 { + equals(QMAKE_HOST.os, Windows) { GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin exists($$GNUTOOLS_DIR/gperf.exe) { GNUTOOLS = "(set $$escape_expand(\\\")PATH=$$toSystemPath($$GNUTOOLS_DIR);%PATH%$$escape_expand(\\\"))" diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 69f039387..06f10dec5 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -106,7 +106,7 @@ if(win32|mac):!macx-xcode { # A newer version of flex is required on Windows. At the moment the only # one that appears to provide binaries and is not cygwin is winflex. FLEX = flex -win32: FLEX = win_flex +equals(QMAKE_HOST.os, Windows): FLEX = win_flex BIN_EXTENSION = win32: BIN_EXTENSION = .exe diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 46293fe6a..7b3ab01c4 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -196,7 +196,7 @@ defineTest(haveQt) { } defineTest(programExistsInPath) { - win32: program = $${1}.exe + equals(QMAKE_HOST.os, Windows): program = $${1}.exe else: program = $$1 PATH = "$$(PATH)" |