From 7c7d8f870e028bd288dee6b2cab9869e17794ce9 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 7 Mar 2016 20:11:11 +0000 Subject: Refactor iOS builds to facilitate tvOS port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Reviewed-by: Tor Arne Vestbø --- mkspecs/macx-ios-clang/features/default_pre.prf | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 mkspecs/macx-ios-clang/features/default_pre.prf (limited to 'mkspecs/macx-ios-clang/features/default_pre.prf') 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 -} -- cgit v1.2.3