From ad4f7b59ead6c4eb17e787bce25a7211b866063f Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 30 Jan 2017 04:02:10 -0800 Subject: Fix iOS build This fixes a regression introduced in the merge 318b5856. Due to the removal of actual simulator_and_device in 5.8 (397f345a6), conditions using it have become meaningless. Task-number: QTBUG-58440 Change-Id: I9f874f9f85efa590c40602dbcd07793ff17d35f5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Liang Qi --- mkspecs/features/mac/default_post.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 623a348684..1df6c4f8b2 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -88,7 +88,7 @@ macx-xcode { tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET - # If we're doing a simulator_and_device build, device and simulator + # If we're doing a simulator and device build, device and simulator # architectures use different paths and flags for the sysroot and # deployment target switch, so we must multiplex them across multiple # architectures using -Xarch. Otherwise we fall back to the simple path. @@ -96,7 +96,7 @@ macx-xcode { # and makes it easier for people to override EXPORT_VALID_ARCHS to limit # individual rules to a different set of architecture(s) from the overall # build (such as machtest in QtCore). - simulator_and_device { + simulator:device { QMAKE_XARCH_CFLAGS = QMAKE_XARCH_LFLAGS = QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- cgit v1.2.3