diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
| commit | 3e949b75fd298a30fa4e8b281ecf21fcb038efbe (patch) | |
| tree | 592bb2d6ca846a9d3aee66bc829d21ae8ba8c056 /mkspecs/macx-ios-clang | |
| parent | 4518345b80b0ee1101ecb0e7349728abd237aa6e (diff) | |
| parent | d2b4a789c39eb770068b002d2bc9ceb764dedf3d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
qtbase.pro
Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
Diffstat (limited to 'mkspecs/macx-ios-clang')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 15 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/features/resolve_config.prf | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index e5c78a0ea4..37964b688b 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -24,21 +24,6 @@ macx-xcode { ios_device_family.value = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY QMAKE_MAC_XCODE_SETTINGS += ios_device_family - # If QMAKE_BUNDLE_DATA contains an asset catalog that includes an - # AppIcon.appiconset, we configure Xcode to use it for app icons. - for(bundle_data, QMAKE_BUNDLE_DATA) { - for(bundle_file, $${bundle_data}.files) { - !contains(bundle_file, .*\.xcassets$): next() - !exists($$absolute_path($$bundle_file/AppIcon.appiconset, $$_PRO_FILE_PWD_)): next() - - asset_catalog_appicon.name = "ASSETCATALOG_COMPILER_APPICON_NAME" - asset_catalog_appicon.value = "AppIcon" - QMAKE_MAC_XCODE_SETTINGS += asset_catalog_appicon - break() - } - !isEmpty(asset_catalog_appicon.name): break() - } - # Set up default 4-inch iPhone/iPod launch image so that our apps # support the full screen resolution of those devices. qmake_launch_image = Default-568h@2x.png 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) { |