From c3278e33534fe937fe367dfbf648282ceba68c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 20 Nov 2012 15:25:34 +0100 Subject: iOS: Replace device and simulator makespecs with single makespec And use configure's -sdk argument to choose between the iphoneos and the iphonesimulator SDK. xcodebuild -showsdks can be used to list the available SDKs. Passing an SDK without a version postfix implies the latest version of the SDK. Change-Id: I881df754d522fc91aaa16ba3e39cf0c37a21a1f1 Reviewed-by: Richard Moe Gustavsen --- mkspecs/common/ios/qmake.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mkspecs/common/ios/qmake.conf') diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 9235e68b0d..2a8d64fd9f 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -3,11 +3,7 @@ # # Depends on: # -# QMAKE_XCODE_DEVELOPER_PATH - set in mkspecs/common/ios/versions.conf -# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf -# QMAKE_IOS_SDK_VERSION - set in mkspecs/common/ios/versions.conf -# QMAKE_IOSSIMULATOR_SDK_VERSION - set in mkspecs/common/ios/versions.conf -# +# QMAKE_XCODE_DEVELOPER_PATH - set in mkspecs/common/xcode.conf QMAKE_XCODE_TOOLCHAIN_BIN_PATH = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin -- cgit v1.2.3