diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uikit/default_pre.prf | 29 |
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 |