Commit d7e0708d authored by Jake Petroules's avatar Jake Petroules

Let qmake handle asset catalog compilation on macOS

Change-Id: I9451a0cd7b15bb6c84147298a4f1fde5d67ddf4d
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
parent 2144fb59
......@@ -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
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment