summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/ios/qmake.conf
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-25 16:17:19 +0200
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-26 13:13:25 +0100
commit20cfe045356aa573570936028511a35b121c20ad (patch)
tree71e13a84b16e08a9a0a61852d79cf599132c3ab7 /mkspecs/common/ios/qmake.conf
parentde5553aad52f8a8343d53bac5e9d29bcd67fbf2c (diff)
iOS: Remove hard-coding of Xcode /Developer path in common/ios mkspecs
We can use xcode-select -print-path to get the /Developer directory. This also removes the need for the "legacy" makespecs, which only differ from their non-legacy counterparts in the location of the Xcode developer directory. Change-Id: Ia9245033a4b82cc3933226bf998f07177b60871f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/common/ios/qmake.conf')
-rw-r--r--mkspecs/common/ios/qmake.conf9
1 files changed, 2 insertions, 7 deletions
diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf
index 6d38e16581..dcc674556b 100644
--- a/mkspecs/common/ios/qmake.conf
+++ b/mkspecs/common/ios/qmake.conf
@@ -3,6 +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
@@ -18,14 +19,8 @@ else {
QMAKE_IOS_SIMULATOR_SDK_VERSION =
}
-!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
- # Xcode 4.3+ is stored in /Applications
- QMAKE_IOS_XCODE_PATH = /Applications/Xcode.app/Contents
-} else: QMAKE_IOS_XCODE_PATH =
-
# iOS platform /Developer path
-QMAKE_IOS_DEV_PATH = $$QMAKE_IOS_XCODE_PATH/Developer/Platforms/$${QMAKE_IOS_DEVICE_TYPE}.platform/Developer
-QMAKE_IOS_XCODE_PATH =
+QMAKE_IOS_DEV_PATH = $$QMAKE_XCODE_DEVELOPER_PATH/Platforms/$${QMAKE_IOS_DEVICE_TYPE}.platform/Developer
# iOS platform SDK path
QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/$${QMAKE_IOS_DEVICE_TYPE}$${QMAKE_IOS_SDK_VERSION}.sdk