AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Don't hard-code simulator and device architectures

Browse Source 
Change-Id: Id5a370248b553b7393ec1b187bd34c0ab9f28496
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-10-17 16:46:32 +02:00 committed by The Qt Project
parent 8ccb9096b9
commit 14b7400de9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/macx-ios-clang/features/default_post.prf
View File

@ -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

3
mkspecs/macx-ios-clang/qmake.conf
View File

@ -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)