From 6e594a945164d661d0e1336fcdde784ccd41f5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 1 Nov 2012 13:18:15 +0100 Subject: iOS: Move device/simulator conditionals out of common mkspecs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- mkspecs/common/ios/versions.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mkspecs/common/ios/versions.conf') 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 -- cgit v1.2.3