summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/ios.conf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/common/ios.conf')
-rw-r--r--mkspecs/common/ios.conf14
1 files changed, 10 insertions, 4 deletions
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf
index 7420b56daf..5ff2f9b416 100644
--- a/mkspecs/common/ios.conf
+++ b/mkspecs/common/ios.conf
@@ -3,17 +3,23 @@
#
MAKEFILE_GENERATOR = UNIX
-CONFIG += ios reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname
+CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk
QMAKE_INCREMENTAL_STYLE = sublib
-# Qt can't build iOS app bundle :(
-CONFIG -= app_bundle
+# FIXME: Transform ios.conf to follow the same inheritance pattern as eg mac.conf and unix.conf
+QMAKE_PLATFORM = ios $$QMAKE_PLATFORM
# Not deploying to Mac OSX
QMAKE_MACOSX_DEPLOYMENT_TARGET =
+# But to iOS
+QMAKE_IOS_DEPLOYMENT_TARGET = 4.3
+
# Add iOS common folder to include path
INCLUDEPATH += $$PWD/ios
# iOS defines
-DEFINES += DARWIN_NO_CARBON Q_OS_IOS QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG
+DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG
+
+# Universal target (iPhone and iPad)
+QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2