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/features/mac/default_pre.prf | |
| 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/features/mac/default_pre.prf')
| -rw-r--r-- | mkspecs/features/mac/default_pre.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index 1190efed5d..db1022294a 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,4 +1,4 @@ -CONFIG = rez $$CONFIG +CONFIG = asset_catalogs rez $$CONFIG load(default_pre) isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { @@ -33,6 +33,8 @@ isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { cache(QMAKE_TARGET_BUNDLE_PREFIX) } +QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon + # Make the default debug info format for static debug builds # DWARF instead of DWARF with dSYM. This cuts down build times # for application debug builds significantly, as Xcode doesn't |