diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-25 16:17:19 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:25 +0100 |
commit | 20cfe045356aa573570936028511a35b121c20ad (patch) | |
tree | 71e13a84b16e08a9a0a61852d79cf599132c3ab7 /mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf | |
parent | de5553aad52f8a8343d53bac5e9d29bcd67fbf2c (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/unsupported/macx-iosdevice-g++-legacy/qmake.conf')
-rw-r--r-- | mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf b/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf deleted file mode 100644 index 5fcfb4a51d..0000000000 --- a/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf +++ /dev/null @@ -1,35 +0,0 @@ -# -# qmake configuration for ios-device-g++ -# -# Depends on: -# -# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf -# - -include(../../common/mac.conf) -include(../../common/gcc-base-ios.conf) -include(../../common/g++-macx.conf) -include(../../common/ios.conf) -include(../../common/ios/versions.conf) -include(../../common/ios/g++.conf) -include(../../common/ios/qmake.conf) - -# Version check (g++ was discontinued at version 4.2, but user may have added it themselves) -!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.2.x or earlier") - -# iOS build tools -QMAKE_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -QMAKE_CXX = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id -QMAKE_AR = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq -QMAKE_RANLIB = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX - -# Check that compiler is valid -!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the g++ 4.2 compiler") - -load(qt_config) - -# Include after config is loaded to allow autodetection on GL/ES version -include(../../common/ios/arch.conf) |