qmake/compiler.pri: fix value of MUMBLE_ARCH on Qt 5. #2955
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
mkrautz
force-pushed
the
mumble-arch-qt5
branch
from
e74abd2
to
a58815c
Compare
davidebeatrici
approved these changes
Mar 18, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.