1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make TARGETED_DEVICE_FAMILY variable platform independent

Browse Source 
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>
This commit is contained in:
Jake Petroules 2016-08-30 10:35:50 -07:00
parent 603628b1ea
commit beaa792e20
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/features/uikit/default_post.prf
View File

@ -19,10 +19,13 @@ equals(TEMPLATE, app):qt {
load(default_post) load(default_post)
macx-xcode { 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 device_family.name = TARGETED_DEVICE_FAMILY
ios: device_family.value = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY device_family.value = $$QMAKE_APPLE_TARGETED_DEVICE_FAMILY
tvos: device_family.value = $$QMAKE_TVOS_TARGETED_DEVICE_FAMILY
watchos: device_family.value = $$QMAKE_WATCHOS_TARGETED_DEVICE_FAMILY
QMAKE_MAC_XCODE_SETTINGS += device_family QMAKE_MAC_XCODE_SETTINGS += device_family
ios { ios {

2
mkspecs/macx-ios-clang/qmake.conf
View File

@ -5,7 +5,7 @@
QMAKE_IOS_DEPLOYMENT_TARGET = 7.0 QMAKE_IOS_DEPLOYMENT_TARGET = 7.0
# Universal target (iPhone and iPad) # 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_DEVICE_ARCHS = armv7 arm64
QMAKE_APPLE_SIMULATOR_ARCHS = i386 x86_64 QMAKE_APPLE_SIMULATOR_ARCHS = i386 x86_64

2
mkspecs/macx-tvos-clang/qmake.conf
View File

@ -6,7 +6,7 @@ QMAKE_TVOS_DEPLOYMENT_TARGET = 9.1
INCLUDEPATH += $$PWD/tvos INCLUDEPATH += $$PWD/tvos
QMAKE_TVOS_TARGETED_DEVICE_FAMILY = 3 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 3
QMAKE_APPLE_DEVICE_ARCHS = arm64 QMAKE_APPLE_DEVICE_ARCHS = arm64
QMAKE_APPLE_SIMULATOR_ARCHS = x86_64 QMAKE_APPLE_SIMULATOR_ARCHS = x86_64

2
mkspecs/macx-watchos-clang/qmake.conf
View File

@ -6,7 +6,7 @@ QMAKE_WATCHOS_DEPLOYMENT_TARGET = 2.2
INCLUDEPATH += $$PWD/watchos INCLUDEPATH += $$PWD/watchos
QMAKE_WATCHOS_TARGETED_DEVICE_FAMILY = 4 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 4
QMAKE_APPLE_DEVICE_ARCHS = armv7k QMAKE_APPLE_DEVICE_ARCHS = armv7k
QMAKE_APPLE_SIMULATOR_ARCHS = i386 QMAKE_APPLE_SIMULATOR_ARCHS = i386