diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-02-11 13:30:53 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-02-12 18:43:31 +0000 |
| commit | 9daeb6fe9d35b10ed739ea0a0566533524ffd532 (patch) | |
| tree | 99ac951a9279a8a1e260908ddc313b651ec826e5 /mkspecs/macx-ios-clang/features/default_pre.prf | |
| parent | 7f48655fb83bbfe394dcc66f11b01bd634aa2388 (diff) | |
Generalize iOS simulator and device exclusive build
Preparation for Apple tvOS support, which shares a lot with the iOS
platform.
Change-Id: I543d936b9973a60139889da2a3d4948914e9c2b2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/macx-ios-clang/features/default_pre.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_pre.prf | 8 |
1 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..a857c49007 100644 --- a/mkspecs/macx-ios-clang/features/default_pre.prf +++ b/mkspecs/macx-ios-clang/features/default_pre.prf @@ -2,15 +2,15 @@ load(default_pre) # In case Qt was built for a specific SDK -!iphonesimulator_and_iphoneos:contains(QMAKE_MAC_SDK, ^iphonesimulator.*): \ - CONFIG += iphonesimulator +!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") -iphonesimulator_and_iphoneos:iphonesimulator { - # For a iphonesimulator_and_iphoneos build all the config tests +simulator_and_device:iphonesimulator { + # 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. QT_ARCH = i386 |