summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-12-06 15:29:05 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 13:07:23 +0100
commit5da648043df5b2e8ccfa720ee56b04dea47c0601 (patch)
tree29328051ac55d3d37c56755791d3f7caaccde62a /mkspecs
parente846edff33ecbd3fc5f4206febc01265ef916d9c (diff)
iOS: Target both iPhone and iPad by default
Change-Id: I3122b9391c6187da17389c889a456c58210dca09 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/ios.conf3
-rw-r--r--mkspecs/features/ios/default_post.prf6
2 files changed, 9 insertions, 0 deletions
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf
index 4c1c1f093d..5ff2f9b416 100644
--- a/mkspecs/common/ios.conf
+++ b/mkspecs/common/ios.conf
@@ -20,3 +20,6 @@ INCLUDEPATH += $$PWD/ios
# iOS defines
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
diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf
index e4221e4b65..f5e7b3c02d 100644
--- a/mkspecs/features/ios/default_post.prf
+++ b/mkspecs/features/ios/default_post.prf
@@ -34,4 +34,10 @@ gui_app {
}
}
+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)