summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-10-27 01:36:01 -0700
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-28 12:38:02 +0000
commitd10c4f08d46cfe457e0e802b4f654f7911155cb0 (patch)
treeed5d5dd8281eeeeca317413efbe6835595ea284b /mkspecs
parentbda6c2b018d31eaa53e67d0274d0d5863ae2f11c (diff)
Be more robust about ensuring that device and simulator are set
These CONFIG entries are also needed during configure, and preemptively fixes build errors uncovered by an upcoming forward merge, due to code restructuring. Change-Id: I39ae5e0f24bbd43dd3c04225d42cce4edd199094 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/uikit/default_pre.prf29
1 files changed, 16 insertions, 13 deletions
diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf
index b6974388ce..ecc3b9d3ab 100644
--- a/mkspecs/features/uikit/default_pre.prf
+++ b/mkspecs/features/uikit/default_pre.prf
@@ -1,20 +1,23 @@
+sim_and_dev = false
+!isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
+ sim_and_dev = true
-!isEmpty(QT_VERSION) {
- qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
- CONFIG += device $${device.sdk}
- qtConfig(simulator_and_device)|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
- CONFIG += simulator $${simulator.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${device.sdk}.*): \
+ CONFIG += device $${device.sdk}
+$$sim_and_dev|contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
+ CONFIG += simulator $${simulator.sdk}
- qtConfig(simulator_and_device) {
- # For a simulator_and_device build all the config tests
- # are based on the device's ARM SDK, but we know that the simulator
- # is Intel and that we support SSE/SSE2.
- QT_CPU_FEATURES.$$QT_ARCH += sse sse2
- CONFIG += sse sse2
- DEFINES += QT_COMPILER_SUPPORTS_SSE2
- }
+$$sim_and_dev {
+ # For a simulator_and_device build all the config tests
+ # are based on the device's ARM SDK, but we know that the simulator
+ # is Intel and that we support SSE/SSE2.
+ QT_CPU_FEATURES.$$QT_ARCH += sse sse2
+ CONFIG += sse sse2
+ DEFINES += QT_COMPILER_SUPPORTS_SSE2
}
+unset(sim_and_dev)
+
load(default_pre)
# Check for supported Xcode versions