diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-10-17 16:46:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-18 15:36:16 +0200 |
commit | 14b7400de9bbe967a417c381b099186015013d57 (patch) | |
tree | de89b43dcfa2bf058f5eeab48c633c14d06caf7d /mkspecs | |
parent | 8ccb9096b931ed613d47f82b43eefdd4ac779436 (diff) |
iOS: Don't hard-code simulator and device architectures
Change-Id: Id5a370248b553b7393ec1b187bd34c0ab9f28496
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 4 | ||||
-rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 0922a8e601..fa81ae406d 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -58,9 +58,9 @@ macx-xcode { # Be more specific about which architecture we're targeting equals(QT_ARCH, arm): \ - actual_archs = armv7 + actual_archs = $$QMAKE_IOS_DEVICE_ARCHS else: \ - actual_archs = $$QT_ARCH + actual_archs = $$QMAKE_IOS_SIMULATOR_ARCHS macx-xcode { QMAKE_XCODE_ARCHS = $$actual_archs diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index b8ef04858a..7b2e7a17e7 100644 --- a/mkspecs/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -15,6 +15,9 @@ DEFINES += DARWIN_NO_CARBON QT_NO_PRINTER QT_NO_PRINTDIALOG # Universal target (iPhone and iPad) QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 +QMAKE_IOS_DEVICE_ARCHS = armv7 +QMAKE_IOS_SIMULATOR_ARCHS = i386 + include(../common/ios.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) |