diff options
Diffstat (limited to 'mkspecs/macx-ios-clang')
-rw-r--r-- | mkspecs/macx-ios-clang/features/default_pre.prf | 4 | ||||
-rw-r--r-- | mkspecs/macx-ios-clang/features/sdk.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_pre.prf b/mkspecs/macx-ios-clang/features/default_pre.prf index dfede454b5..b5c41cf43e 100644 --- a/mkspecs/macx-ios-clang/features/default_pre.prf +++ b/mkspecs/macx-ios-clang/features/default_pre.prf @@ -2,14 +2,14 @@ load(default_pre) # In case Qt was built for a specific SDK -!iphonesimulator_and_iphoneos:contains(QMAKE_MAC_SDK, ^iphonesimulator.*): \ +!contains(QT_CONFIG, simulator_and_device):contains(QMAKE_MAC_SDK, ^iphonesimulator.*): \ CONFIG += iphonesimulator # Check for supported Xcode versions lessThan(QMAKE_XCODE_VERSION, "4.3"): \ error("This mkspec requires Xcode 4.3 or later") -iphonesimulator_and_iphoneos:iphonesimulator { +build_pass:iphonesimulator { # For a iphonesimulator_and_iphoneos 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. diff --git a/mkspecs/macx-ios-clang/features/sdk.prf b/mkspecs/macx-ios-clang/features/sdk.prf index 32fcbb7289..4d148f22fb 100644 --- a/mkspecs/macx-ios-clang/features/sdk.prf +++ b/mkspecs/macx-ios-clang/features/sdk.prf @@ -1,12 +1,12 @@ # In case the user sets the SDK manually contains(QMAKE_MAC_SDK, ^iphonesimulator.*) { - iphonesimulator_and_iphoneos: \ + contains(QT_CONFIG, simulator_and_device): \ error("iOS simulator is handled automatically for iphonesimulator_and_iphoneos") CONFIG += iphonesimulator } -iphonesimulator_and_iphoneos:iphonesimulator: \ +build_pass:iphonesimulator: \ QMAKE_MAC_SDK ~= s,^iphoneos,iphonesimulator, load(sdk) |