diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-08-30 10:35:50 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-05 15:24:54 +0000 |
| commit | beaa792e2021aad52ecd98a0e0f0f48571069dba (patch) | |
| tree | 610079d8c09e20ecd86d5b7ce3bce5983316c093 /mkspecs | |
| parent | 603628b1ea1a4003f6295fd97025bd38520af143 (diff) | |
Make TARGETED_DEVICE_FAMILY variable platform independent
This reduces unnecessary OS conditions in qmake since these platforms
are mutually exclusive, and also opens up their potential for use on
future devices (like carOS(?), which is device idiom '5').
This is also more similar to what Xcode does, as the
TARGETED_DEVICE_FAMILY variable is not platform specific.
Change-Id: I29d209cd8e0779f492bda829008264773e13c75c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uikit/default_post.prf | 9 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-tvos-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-watchos-clang/qmake.conf | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index f34d0a9f2c..9a231ffc84 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -19,10 +19,13 @@ equals(TEMPLATE, app):qt { load(default_post) macx-xcode { + ios:isEmpty(QMAKE_APPLE_TARGETED_DEVICE_FAMILY):!isEmpty(QMAKE_IOS_TARGETED_DEVICE_FAMILY) { + warning("QMAKE_IOS_TARGETED_DEVICE_FAMILY is deprecated; use QMAKE_APPLE_TARGETED_DEVICE_FAMILY") + QMAKE_APPLE_TARGETED_DEVICE_FAMILY = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY + } + device_family.name = TARGETED_DEVICE_FAMILY - ios: device_family.value = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY - tvos: device_family.value = $$QMAKE_TVOS_TARGETED_DEVICE_FAMILY - watchos: device_family.value = $$QMAKE_WATCHOS_TARGETED_DEVICE_FAMILY + device_family.value = $$QMAKE_APPLE_TARGETED_DEVICE_FAMILY QMAKE_MAC_XCODE_SETTINGS += device_family ios { diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index 5df225466f..e21445deb7 100644 --- a/mkspecs/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -5,7 +5,7 @@ QMAKE_IOS_DEPLOYMENT_TARGET = 7.0 # Universal target (iPhone and iPad) -QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 +QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 QMAKE_APPLE_DEVICE_ARCHS = armv7 arm64 QMAKE_APPLE_SIMULATOR_ARCHS = i386 x86_64 diff --git a/mkspecs/macx-tvos-clang/qmake.conf b/mkspecs/macx-tvos-clang/qmake.conf index 8038ae6846..e945cc9d28 100644 --- a/mkspecs/macx-tvos-clang/qmake.conf +++ b/mkspecs/macx-tvos-clang/qmake.conf @@ -6,7 +6,7 @@ QMAKE_TVOS_DEPLOYMENT_TARGET = 9.1 INCLUDEPATH += $$PWD/tvos -QMAKE_TVOS_TARGETED_DEVICE_FAMILY = 3 +QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 3 QMAKE_APPLE_DEVICE_ARCHS = arm64 QMAKE_APPLE_SIMULATOR_ARCHS = x86_64 diff --git a/mkspecs/macx-watchos-clang/qmake.conf b/mkspecs/macx-watchos-clang/qmake.conf index 3ad02b636e..03c05ad717 100644 --- a/mkspecs/macx-watchos-clang/qmake.conf +++ b/mkspecs/macx-watchos-clang/qmake.conf @@ -6,7 +6,7 @@ QMAKE_WATCHOS_DEPLOYMENT_TARGET = 2.2 INCLUDEPATH += $$PWD/watchos -QMAKE_WATCHOS_TARGETED_DEVICE_FAMILY = 4 +QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 4 QMAKE_APPLE_DEVICE_ARCHS = armv7k QMAKE_APPLE_SIMULATOR_ARCHS = i386 |