5 files changed, 84 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index 39144e7216..b4569df6d5 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -7,6 +7,9 @@ equals(MAKEFILE_GENERATOR, UNIX) {
         QMAKE_MAKE = mingw32-make
 } else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
     QMAKE_MAKE = nmake
+} else:ios {
+    # iOS unsets MAKEFILE_GENERATOR in its default_pre.prf
+    QMAKE_MAKE = make
 } else {
     error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.")
 }
diff --git a/mkspecs/features/ios.prf b/mkspecs/features/ios.prf
new file mode 100644
index 0000000000..841378e8dd
--- /dev/null
+++ b/mkspecs/features/ios.prf
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000000..f5e7b3c02d
--- /dev/null
+++ b/mkspecs/features/ios/default_post.prf
@@ -0,0 +1,43 @@
+
+CONFIG(qt):contains(QT, gui):equals(TEMPLATE, app): CONFIG += gui_app
+
+isEmpty(MAKEFILE_GENERATOR) {
+    gui_app:app_bundle: \
+        # For applications we want Xcode project files
+        MAKEFILE_GENERATOR = XCODE
+    else: \
+        # For libs, etc we still want regular Makefiles
+        MAKEFILE_GENERATOR = UNIX
+}
+
+gui_app {
+    # We have to do the link and dependency resolution for the platform plugin
+    # manually, since QTPLUGIN and the prl lookup logic does not support
+    # the -force_load link style. The -force_load option ensures that all
+    # symbols from the static library are included, not just the ones the
+    # linker have seen a use for so far. We need this because we load the platform
+    # plugin from the platform plugin itself, using Q_IMPORT_PLUGIN.
+    lib_path_and_base = $$[QT_INSTALL_PLUGINS/get]/platforms/libqios$$qtPlatformTargetSuffix()
+    LIBS += "-force_load $${lib_path_and_base}.$${QMAKE_EXTENSION_STATICLIB}"
+    LIBS += $$fromfile($${lib_path_and_base}.prl, QMAKE_PRL_LIBS)
+
+    # Which means we don't want the auto-generated import for the platform plugin
+    CONFIG -= import_qpa_plugin
+
+    !no_main_wrapper {
+        # We link the iosmain library manually as well, since it's not really a plugin
+        lib_name = qiosmain
+        lib_path_and_base = $$[QT_INSTALL_PLUGINS/get]/platforms/lib$${lib_name}$$qtPlatformTargetSuffix()
+        LIBS += -L$$[QT_INSTALL_PLUGINS/get]/platforms -l$${lib_name}$$qtPlatformTargetSuffix()
+        LIBS += $$fromfile($${lib_path_and_base}.prl, QMAKE_PRL_LIBS)
+        DEFINES += main=qt_main
+    }
+}
+
+contains(MAKEFILE_GENERATOR, XCODE) {
+    ios_device_family.name = TARGETED_DEVICE_FAMILY
+    ios_device_family.value = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY
+    QMAKE_MAC_XCODE_SETTINGS += ios_device_family
+}
+
+load(default_post)
diff --git a/mkspecs/features/ios/default_pre.prf b/mkspecs/features/ios/default_pre.prf
new file mode 100644
index 0000000000..e2956bd77d
--- /dev/null
+++ b/mkspecs/features/ios/default_pre.prf
@@ -0,0 +1,4 @@
+# Unset makefile generator, so we can auto-detect value in default_post
+unset(MAKEFILE_GENERATOR)
+
+load(default_pre)
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 320e4e5382..16dd16159c 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -37,7 +37,15 @@
 }
 
 !equals(MAKEFILE_GENERATOR, XCODE) {
-    version_min_flag = -m$${QMAKE_MAC_PLATFORM_NAME}-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
+    # FIXME: Get the version_min_flag out of the platform's 'Native Build System.xcspec'
+    version_identifier = $$replace(QMAKE_MAC_PLATFORM_NAME, iphonesimulator, ios-simulator)
+
+    ios:!host_build: \
+        deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
+    else: \
+        deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
+
+    version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
     QMAKE_CFLAGS += $$version_min_flag
     QMAKE_CXXFLAGS += $$version_min_flag
     QMAKE_OBJECTIVE_CFLAGS += $$version_min_flag