diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-03-18 12:11:04 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-03-18 12:11:04 +0300 |
| commit | a58815c7a74c923874b8fa1704c56d4f74dec991 (patch) | |
| tree | 351fac07cb096e7d4a2e323e55a990c4115df415 /qmake | |
| parent | 10079ed9867308aad098231f86e260bd831b0ac6 (diff) | |
qmake/compiler.pri: fix value of MUMBLE_ARCH on Qt 5.
The MinGW PR changed MUMBLE_ARCH to use QT_ARCH on Qt 5.
However, QT_ARCH uses 'i386' for 32-bit x86, we're currently
using 'x86' throughout our .pro files.
To fix this problem, we map 'i386' back to 'x86'.
This is currently breaking the win32-static (x86) build.
Diffstat (limited to 'qmake')
| -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 f23beebea..4a1b25d19 100644 --- a/qmake/compiler.pri +++ b/qmake/compiler.pri @@ -28,6 +28,11 @@ MUMBLE_ARCH = $$QMAKE_TARGET.arch # It also works for cross-builds. isEqual(QT_MAJOR_VERSION, 5) { MUMBLE_ARCH = $$QT_ARCH + # QT_ARCH uses 'i386' instead of 'x86', + # so map that value back to what we expect. + equals(MUMBLE_ARCH, i386) { + MUMBLE_ARCH=x86 + } } win32-g++ { |