diff options
Diffstat (limited to 'mkspecs/macx-ios-clang/features/resolve_config.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/resolve_config.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/macx-ios-clang/features/resolve_config.prf b/mkspecs/macx-ios-clang/features/resolve_config.prf index c3ab90f45e..a964ee3278 100644 --- a/mkspecs/macx-ios-clang/features/resolve_config.prf +++ b/mkspecs/macx-ios-clang/features/resolve_config.prf @@ -30,7 +30,11 @@ macx-xcode { QMAKE_MAC_XCODE_SETTINGS += library_suffix_simulator CONFIG *= xcode_dynamic_library_suffix } else { - addExclusiveBuilds(simulator, device) + # Switch the order to make sure that the first Makefile target is the right one + !contains(QT_CONFIG, simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \ + addExclusiveBuilds(simulator, device) + else: \ + addExclusiveBuilds(device, simulator) } equals(TEMPLATE, subdirs) { |