diff options
| -rw-r--r-- | mkspecs/macx-ios-clang/features/resolve_config.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/macx-ios-clang/features/resolve_config.prf b/mkspecs/macx-ios-clang/features/resolve_config.prf index d1d3e8ca39..64db2252cb 100644 --- a/mkspecs/macx-ios-clang/features/resolve_config.prf +++ b/mkspecs/macx-ios-clang/features/resolve_config.prf @@ -26,7 +26,12 @@ macx-xcode { } else { iphonesimulator.name = Simulator iphoneos.name = Device - addExclusiveBuilds(iphonesimulator, iphoneos) + + # 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, ^iphonesimulator.*): \ + addExclusiveBuilds(iphonesimulator, iphoneos) + else: \ + addExclusiveBuilds(iphoneos, iphonesimulator) } equals(TEMPLATE, subdirs) { |