diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-28 18:31:11 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 19:22:05 +0100 |
commit | 0520631b2ba04fb99d3d46385f04279cd89a7732 (patch) | |
tree | c970fab36c889741dedcb708e520fe9ec517fc07 /mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf | |
parent | 439002cddeb32766ea9806ac8b5cf9a973ed0f13 (diff) | |
parent | 70d5cb406fda70d175faac5f9588f0e345588c56 (diff) |
Merge "Merge branch 'ios' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf')
-rw-r--r-- | mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf b/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf deleted file mode 100644 index abc695231e..0000000000 --- a/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# qmake configuration for ios-simulator-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/arch.conf) -include(../../common/ios/g++.conf) -include(../../common/ios/qmake.conf) - -# Version check (g++ was discontinued at version 4.2) -!lessThan(QMAKE_IOS_XCODE_VERSION, "4.2"): error("This mkspec requires Xcode 4.1.x or earlier") - -# iOS build tools -QMAKE_CC = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -QMAKE_CXX = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/install_name_tool -id -QMAKE_AR = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ar cq -QMAKE_RANLIB = /Developer/Platforms/iPhoneSimulator.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) |