diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2017-01-31 10:37:30 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2017-03-17 21:14:16 +0300 |
| commit | 886098b4163bc45cc406f5b98d1c7bbfd4aa36e4 (patch) | |
| tree | 337d8cf2b59e931008c135ed7427f5fd22a68ab5 /qmake/compiler.pri | |
| parent | 0a253c7dea790e3b4d4aaa86d6c911cf66650623 (diff) | |
compiler.pri: Use QT_ARCH instead of QMAKE_target.arch with Qt 5
QMAKE_target.arch doesn't return "x86_64" with MinGW x64.
Diffstat (limited to 'qmake/compiler.pri')
| -rw-r--r-- | qmake/compiler.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/compiler.pri b/qmake/compiler.pri index 26e556904..57e0a8c18 100644 --- a/qmake/compiler.pri +++ b/qmake/compiler.pri @@ -24,6 +24,11 @@ QMAKE_RESOURCE_FLAGS += -compress 9 # QMAKE_TARGET.arch doesn't suffice any longer, and # we define MUMBLE_ARCH to be used in its place. MUMBLE_ARCH = $$QMAKE_TARGET.arch +# When using Qt 5, use QT_ARCH instead of QMAKE_TARGET. +# It also works for cross-builds. +isEqual(QT_MAJOR_VERSION, 5) { + MUMBLE_ARCH = $$QT_ARCH +} win32 { # Define the CONFIG options 'force-x86-toolchain' and |