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