From ae39a84603a91a7de8dbc23e677827bcdb12e996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Mon, 11 Mar 2013 14:54:06 +0100
Subject: [PATCH] iOS: Move arch handling out of ios.prf now that we have
 default_post.prf

Change-Id: Ifad6463414d4fb055007653d06f2c17ca5ee953e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
 mkspecs/features/ios.prf              | 25 -------------------------
 mkspecs/features/ios/default_post.prf | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 mkspecs/features/ios.prf

diff --git a/mkspecs/features/ios.prf b/mkspecs/features/ios.prf
deleted file mode 100644
index 841378e8dd..0000000000
--- a/mkspecs/features/ios.prf
+++ /dev/null
@@ -1,25 +0,0 @@
-isEmpty(QT_ARCH) {
-    # The iPhoneOS and iPhoneSimulator targets share the same toolchain,
-    # so when configure runs the arch tests it passes the correct sysroot,
-    # but we fail to pick up the architecture since we're not passing -arch
-    # yet. Xcode does not seem to have a way to run the shared toolchain
-    # in a way that will automatically  do this (for example xcrun -sdk).
-    contains(QMAKE_MAC_SDK, iphoneos.*): QT_ARCH = armv7
-    else: QT_ARCH = i386 # Simulator
-} else {
-    # Fix up the QT_ARCH to be more specific
-    equals(QT_ARCH, arm) {
-        # Samsung S5PC100, Apple A4, A5, A5X
-        QT_ARCH = armv7
-
-        # FIXME: How do we support armv7s when Qt can't do universal builds?
-    }
-}
-
-!equals(MAKEFILE_GENERATOR, XCODE) {
-    arch_flag = -arch $$QT_ARCH
-    QMAKE_CFLAGS           += $$arch_flag
-    QMAKE_CXXFLAGS         += $$arch_flag
-    QMAKE_OBJECTIVE_CFLAGS += $$arch_flag
-    QMAKE_LFLAGS           += $$arch_flag
-}
diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf
index f5e7b3c02d..e9d2149351 100644
--- a/mkspecs/features/ios/default_post.prf
+++ b/mkspecs/features/ios/default_post.prf
@@ -40,4 +40,30 @@ contains(MAKEFILE_GENERATOR, XCODE) {
     QMAKE_MAC_XCODE_SETTINGS += ios_device_family
 }
 
+isEmpty(QT_ARCH) {
+    # The iPhoneOS and iPhoneSimulator targets share the same toolchain,
+    # so when configure runs the arch tests it passes the correct sysroot,
+    # but we fail to pick up the architecture since we're not passing -arch
+    # yet. Xcode does not seem to have a way to run the shared toolchain
+    # in a way that will automatically  do this (for example xcrun -sdk).
+    contains(QMAKE_MAC_SDK, iphoneos.*): QT_ARCH = armv7
+    else: QT_ARCH = i386 # Simulator
+} else {
+    # Fix up the QT_ARCH to be more specific
+    equals(QT_ARCH, arm) {
+        # Samsung S5PC100, Apple A4, A5, A5X
+        QT_ARCH = armv7
+
+        # FIXME: How do we support armv7s when Qt can't do universal builds?
+    }
+}
+
+!equals(MAKEFILE_GENERATOR, XCODE) {
+    arch_flag = -arch $$QT_ARCH
+    QMAKE_CFLAGS           += $$arch_flag
+    QMAKE_CXXFLAGS         += $$arch_flag
+    QMAKE_OBJECTIVE_CFLAGS += $$arch_flag
+    QMAKE_LFLAGS           += $$arch_flag
+}
+
 load(default_post)