diff options
author | Mike Krus <mike.krus@kdab.com> | 2016-03-07 20:11:11 +0000 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-05-05 02:08:51 +0000 |
commit | 7c7d8f870e028bd288dee6b2cab9869e17794ce9 (patch) | |
tree | d5cc7827e86f696f5794b9566dc414d890337ac4 /mkspecs/macx-ios-clang/features/default_pre.prf | |
parent | 6fb56a74c87c49341f2313f2dfc2f526e498fede (diff) |
Refactor iOS builds to facilitate tvOS port
- moved prf files to shared location (uikit, added to QMAKE_PLATFORM)
- prepare some formatting (unconditional blocks mostly) to add conditions later
- make device detection script more generic, passing filter strings
as a parameter and returning non-os specific variables
Change-Id: I61f2b77093304ff985bec9da04fda57ff296b16b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'mkspecs/macx-ios-clang/features/default_pre.prf')
-rw-r--r-- | mkspecs/macx-ios-clang/features/default_pre.prf | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_pre.prf b/mkspecs/macx-ios-clang/features/default_pre.prf deleted file mode 100644 index a857c49007..0000000000 --- a/mkspecs/macx-ios-clang/features/default_pre.prf +++ /dev/null @@ -1,21 +0,0 @@ - -load(default_pre) - -# In case Qt was built for a specific SDK -!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 { - # 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 - QT_CPU_FEATURES.i386 = sse sse2 - DEFINES += QT_COMPILER_SUPPORTS_SSE2 - CONFIG -= neon - CONFIG += sse sse2 -} |