diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 18:07:22 +0200 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-10 06:36:52 +0000 |
commit | e005e99005d83e89ef2499320306c46a14965e7a (patch) | |
tree | 926718b7c283edf85985d031c026ba6d2488c6b9 /mkspecs/macx-ios-clang | |
parent | 196d55ba5c8d169d120f17ca1db3d85ea1e5b4dd (diff) |
fix ios device&simulator builds again
the assumption stated in b67a0836d is actually invalid - configure sets
build_all without debug_and_release there. debug_and_release does
actually imply build_all, though.
to make things less confusing, don't let configure inject
iphonesimulator_and_iphoneos into all projects, but handle it like
debug_and_release instead.
Change-Id: Ib7acdc63308a538862fc603428f81aba60bca08e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
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) |