summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/ios/versions.conf
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-15 16:35:52 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-26 14:28:01 +0100
commit2aeb742a581efa354e0ff93296d5caf66c38d88d (patch)
tree7be01276933aa2626df754c4b0a239dbb1f4342c /mkspecs/common/ios/versions.conf
parent6e594a945164d661d0e1336fcdde784ccd41f5b7 (diff)
iOS: Use sdk.prf to set -isysroot based on the chosen SDK
Change-Id: I4683ab422ad886b86604fbd68f8dfb4cf6bfc06e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/common/ios/versions.conf')
-rw-r--r--mkspecs/common/ios/versions.conf10
1 files changed, 3 insertions, 7 deletions
diff --git a/mkspecs/common/ios/versions.conf b/mkspecs/common/ios/versions.conf
index 488116a2a6..7c2acf9da5 100644
--- a/mkspecs/common/ios/versions.conf
+++ b/mkspecs/common/ios/versions.conf
@@ -87,15 +87,11 @@ isEmpty(QMAKE_IOS_SDK_VERSION) {
greaterThan(v, $$QMAKE_IOS_SDK_VERSION): QMAKE_IOS_SDK_VERSION = $$v
}
- isEmpty(QMAKE_IOS_SDK_VERSION): error("Could not find a usable SDK, please install using Xcode")
+ # We have at least one version of this SDK, so we choose the latest one by
+ # passing the SDK identifier as QMAKE_MAC_SDK, as reccomended by Apple.
+ QMAKE_MAC_SDK = $$sdk_identifier
}
-# iOS platform SDK path
-QMAKE_IOS_SDK_PATH = $$QMAKE_IOS_DEV_PATH/SDKs/$${QMAKE_IOS_DEVICE_TYPE}$${QMAKE_IOS_SDK_VERSION}.sdk
-
-# Make sure iOS SDK version is valid
-!exists($$QMAKE_IOS_SDK_PATH): error("iOS $$QMAKE_IOS_SDK_VERSION SDK not found at $$QMAKE_IOS_SDK_PATH")
-
# No deployment target specified?
isEmpty(QMAKE_IPHONEOS_DEPLOYMENT_TARGET) {
# Use SDK version for iOS versions < preferred