diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:04 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:06 +0100 |
commit | 70d5cb406fda70d175faac5f9588f0e345588c56 (patch) | |
tree | 1b7e95bdf142da42a5d9fea6068a46c78055eddd /mkspecs/unsupported/macx-iosdevice-g++/qmake.conf | |
parent | 3b5600f6ee9f2982c5a93250e577f87a34fe32d1 (diff) | |
parent | 9b05f675e311d1962f0670193cf4df75a07f4999 (diff) |
Merge branch 'ios' into dev
Change-Id: I5d18d502908920a44bbc506aba77dd805d94d843
Diffstat (limited to 'mkspecs/unsupported/macx-iosdevice-g++/qmake.conf')
-rw-r--r-- | mkspecs/unsupported/macx-iosdevice-g++/qmake.conf | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf b/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf deleted file mode 100644 index 2a29335334..0000000000 --- a/mkspecs/unsupported/macx-iosdevice-g++/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.3 or later") - -# iOS build tools -QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id -QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq -QMAKE_RANLIB = /Applications/Xcode.app/Contents/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) |