diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 13:18:15 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:19:01 +0100 |
| commit | 6e594a945164d661d0e1336fcdde784ccd41f5b7 (patch) | |
| tree | 66fc54c27d34eccb264c53d061b1711d9291f9ba /mkspecs/common/ios/arch.conf | |
| parent | d8986893003b2080d2b3383ee283f1b8ee13d645 (diff) | |
iOS: Move device/simulator conditionals out of common mkspecs
Instead we deal with any differenced by setting variables in the top
level makespecs, that are used by the common makespec configs.
Change-Id: Iae1fb5fef8c95778511ed400008731989b446f3c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/common/ios/arch.conf')
| -rw-r--r-- | mkspecs/common/ios/arch.conf | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mkspecs/common/ios/arch.conf b/mkspecs/common/ios/arch.conf index 3e469fe306..6bd27a6136 100644 --- a/mkspecs/common/ios/arch.conf +++ b/mkspecs/common/ios/arch.conf @@ -3,16 +3,6 @@ # ########################################################################### -# Device? -!*simulator*: \ - # Samsung S5PC100, Apple A4, A5, A5X - QMAKE_IOS_TARGET_ARCH = armv7 -else: \ - # Simulator is i386 only - QMAKE_IOS_TARGET_ARCH = i386 - -# FIXME: Add armv7s support when we need it - QMAKE_IOS_ARCH_FLAGS = -arch $$QMAKE_IOS_TARGET_ARCH QMAKE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS @@ -20,5 +10,4 @@ QMAKE_CXXFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_LFLAGS += $$QMAKE_IOS_ARCH_FLAGS -unset(QMAKE_IOS_TARGET_ARCH) unset(QMAKE_IOS_ARCH_FLAGS) |