diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 12:31:36 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:27 +0100 |
| commit | 810eee8c773019168c1fcad8262b847009ec149a (patch) | |
| tree | 59ad2adc993d7f04fa95ce35692bcdb011f20c7e /mkspecs/unsupported/macx-iosdevice-clang | |
| parent | 978eb6bdecdc111a96637be0441ae0230fc0a2e6 (diff) | |
iOS: Bump arch and iOS SDK, now that we require GLES 2.x
We now require SDK version 4.3 or above, and armv7.
Change-Id: I4766e277a3a4a32712bf2ec27fede694e8316c95
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/unsupported/macx-iosdevice-clang')
| -rw-r--r-- | mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf index ed6852e0d6..b04d6070ae 100644 --- a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf @@ -13,6 +13,7 @@ include(../../common/ios.conf) include(../../common/ios/versions.conf) include(../../common/ios/clang.conf) include(../../common/ios/qmake.conf) +include(../../common/ios/arch.conf) # Version check lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later") @@ -29,7 +30,4 @@ 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 clang compiler") -load(qt_config) - -# Include after config is loaded to allow autodetection on GL/ES version -include(../../common/ios/arch.conf) +load(qt_config)
\ No newline at end of file |