From 3c89c71da5f00ada18d9405abddb5812dc4278ea Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 13 Jun 2017 14:22:11 -0700 Subject: Fix handling of deprecated QMAKE_IOS_TARGETED_DEVICE_FAMILY Since the mkspecs always set QMAKE_APPLE_TARGETED_DEVICE_FAMILY, it will never be empty, and the warning message and automatic fallback to QMAKE_IOS_TARGETED_DEVICE_FAMILY will never be used. Task-number: QTBUG-60430 Change-Id: I79e36d355dae3f8a4429d73e753fed3c090a5d24 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/uikit/default_post.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index 0a2e4122f5..f7245e48b1 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -19,7 +19,7 @@ equals(TEMPLATE, app):qt { load(default_post) macx-xcode { - ios:isEmpty(QMAKE_APPLE_TARGETED_DEVICE_FAMILY):!isEmpty(QMAKE_IOS_TARGETED_DEVICE_FAMILY) { + ios:!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 } -- cgit v1.2.3