summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/ios/versions.conf
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-11-01 13:18:15 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-26 13:19:01 +0100
commit6e594a945164d661d0e1336fcdde784ccd41f5b7 (patch)
tree66fc54c27d34eccb264c53d061b1711d9291f9ba /mkspecs/common/ios/versions.conf
parentd8986893003b2080d2b3383ee283f1b8ee13d645 (diff)
iOS: Move device/simulator conditionals out of common mkspecs
Instead we deal with any differenced by setting variables in the top level makespecs, that are used by the common makespec configs. Change-Id: Iae1fb5fef8c95778511ed400008731989b446f3c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/common/ios/versions.conf')
-rw-r--r--mkspecs/common/ios/versions.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/common/ios/versions.conf b/mkspecs/common/ios/versions.conf
index ef6f94cdb6..488116a2a6 100644
--- a/mkspecs/common/ios/versions.conf
+++ b/mkspecs/common/ios/versions.conf
@@ -60,15 +60,14 @@ isEmpty(QMAKE_IOS_XCODE_VERSION) {
QMAKE_IOS_XCODE_INFO =
}
+# Version check
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
QMAKE_XCODE_PLATFORM_PATH = $${QMAKE_XCODE_DEVELOPER_PATH}/Platforms
# iOS 4.3 is the preferred version as it is the earliest version that is armv7/gles2 only
QMAKE_IPHONEOS_PREFERRED_TARGET = 4.3
-# iOS SDK device type
-!*simulator*: QMAKE_IOS_DEVICE_TYPE = iPhoneOS
-else: QMAKE_IOS_DEVICE_TYPE = iPhoneSimulator
-
# iOS platform /Developer path
QMAKE_IOS_DEV_PATH = $$QMAKE_XCODE_DEVELOPER_PATH/Platforms/$${QMAKE_IOS_DEVICE_TYPE}.platform/Developer