From 5da648043df5b2e8ccfa720ee56b04dea47c0601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 6 Dec 2012 15:29:05 +0100 Subject: iOS: Target both iPhone and iPad by default Change-Id: I3122b9391c6187da17389c889a456c58210dca09 Reviewed-by: Richard Moe Gustavsen --- mkspecs/common/ios.conf | 3 +++ mkspecs/features/ios/default_post.prf | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'mkspecs') 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) -- cgit v1.2.3