diff options
Diffstat (limited to 'mkspecs/features/uikit')
| -rw-r--r-- | mkspecs/features/uikit/default_pre.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/uikit/sdk.prf | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/uikit/default_pre.prf b/mkspecs/features/uikit/default_pre.prf index cba5490b6e..ff45c1de0d 100644 --- a/mkspecs/features/uikit/default_pre.prf +++ b/mkspecs/features/uikit/default_pre.prf @@ -2,14 +2,14 @@ load(default_pre) # In case Qt was built for a specific SDK -!simulator_and_device:contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \ +!contains(QT_CONFIG, simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \ CONFIG += simulator $${simulator.sdk} # Check for supported Xcode versions lessThan(QMAKE_XCODE_VERSION, "4.3"): \ error("This mkspec requires Xcode 4.3 or later") -simulator_and_device:iphonesimulator { +build_pass:simulator { # For a simulator_and_device build all the config tests # are based on the iPhoneOS ARM SDK, but we know that the simulator # is i386 and that we support SSE/SSE2. @@ -19,7 +19,7 @@ simulator_and_device:iphonesimulator { CONFIG -= neon CONFIG += sse sse2 } -simulator_and_device:appletvsimulator { +build_pass:appletvsimulator { # For a simulator_and_device build all the config tests # are based on the AppleTVOS ARM SDK, but we know that the simulator # is x64 and that we support SSE/SSE2. diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index ce44ac79fd..94451ea196 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -1,13 +1,13 @@ # In case the user sets the SDK manually contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) { - simulator_and_device: \ + contains(QT_CONFIG, simulator_and_device): \ error("Simulator is handled automatically for simulator_and_device") CONFIG += simulator $${simulator.sdk} } -simulator_and_device:simulator: \ +build_pass:simulator: \ QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk}, load(sdk) |