diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-28 18:52:45 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-11-21 22:40:53 +0000 |
| commit | d7e0708d1a97d2494c107b1179477896e5604d28 (patch) | |
| tree | 3801584fa623660ee52a41c9b68ffd8a9818b6c4 /src/app | |
| parent | 2144fb5949f5bc18f92c58217a422b0a3abd8463 (diff) | |
| download | qt-creator-d7e0708d1a97d2494c107b1179477896e5604d28.tar.gz | |
Let qmake handle asset catalog compilation on macOS
Change-Id: I9451a0cd7b15bb6c84147298a4f1fde5d67ddf4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app.pro | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index b86678ae16..eb8943f570 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -23,28 +23,35 @@ win32 { RC_FILE = qtcreator.rc } else:macx { LIBS += -framework CoreFoundation - ASSETCATALOG.files = $$PWD/qtcreator.xcassets - macx-xcode { - QMAKE_BUNDLE_DATA += ASSETCATALOG + minQtVersion(5, 7, 1) { + QMAKE_ASSET_CATALOGS = $$PWD/qtcreator.xcassets + QMAKE_ASSET_CATALOGS_BUILD_PATH = $$IDE_DATA_PATH + QMAKE_ASSET_CATALOGS_INSTALL_PATH = $$INSTALL_DATA_PATH + QMAKE_ASSET_CATALOGS_APP_ICON = qtcreator } else { - ASSETCATALOG.output = $$IDE_DATA_PATH/qtcreator.icns - ASSETCATALOG.commands = xcrun actool \ - --app-icon qtcreator \ - --output-partial-info-plist $$shell_quote($(TMPDIR)/qtcreator.Info.plist) \ - --platform macosx \ - --minimum-deployment-target 10.7 \ - --compile $$shell_quote($$IDE_DATA_PATH) \ - $$shell_quote($$PWD/qtcreator.xcassets) > /dev/null - ASSETCATALOG.input = ASSETCATALOG.files - ASSETCATALOG.CONFIG += no_link target_predeps - QMAKE_EXTRA_COMPILERS += ASSETCATALOG - icns.files = \ - $$IDE_DATA_PATH/qtcreator.icns \ - $$IDE_DATA_PATH/prifile.icns \ - $$IDE_DATA_PATH/profile.icns - icns.path = $$INSTALL_DATA_PATH - icns.CONFIG += no_check_exist - INSTALLS += icns + ASSETCATALOG.files = $$PWD/qtcreator.xcassets + macx-xcode { + QMAKE_BUNDLE_DATA += ASSETCATALOG + } else { + ASSETCATALOG.output = $$IDE_DATA_PATH/qtcreator.icns + ASSETCATALOG.commands = xcrun actool \ + --app-icon qtcreator \ + --output-partial-info-plist $$shell_quote($(TMPDIR)/qtcreator.Info.plist) \ + --platform macosx \ + --minimum-deployment-target 10.7 \ + --compile $$shell_quote($$IDE_DATA_PATH) \ + $$shell_quote($$PWD/qtcreator.xcassets) > /dev/null + ASSETCATALOG.input = ASSETCATALOG.files + ASSETCATALOG.CONFIG += no_link target_predeps + QMAKE_EXTRA_COMPILERS += ASSETCATALOG + icns.files = \ + $$IDE_DATA_PATH/qtcreator.icns \ + $$IDE_DATA_PATH/prifile.icns \ + $$IDE_DATA_PATH/profile.icns + icns.path = $$INSTALL_DATA_PATH + icns.CONFIG += no_check_exist + INSTALLS += icns + } } QMAKE_INFO_PLIST = Info.plist } |