summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/uikit/resolve_config.prf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features/uikit/resolve_config.prf')
-rw-r--r--mkspecs/features/uikit/resolve_config.prf8
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/resolve_config.prf b/mkspecs/features/uikit/resolve_config.prf
index 70ddd8be52..868813dcbd 100644
--- a/mkspecs/features/uikit/resolve_config.prf
+++ b/mkspecs/features/uikit/resolve_config.prf
@@ -8,4 +8,10 @@ xcodebuild {
load(resolve_config)
-!macx-xcode:xcodebuild: addExclusiveBuilds(simulator, device)
+!macx-xcode:xcodebuild {
+ # Switch the order to make sure that the first Makefile target is the right one
+ !qtConfig(simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
+ addExclusiveBuilds(simulator, device)
+ else: \
+ addExclusiveBuilds(device, simulator)
+}