diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-01-12 22:31:14 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-01-15 17:52:27 +0000 |
| commit | 863606d20e0138474fe4a66fc271b02ee5469d66 (patch) | |
| tree | 59b14301d389c5ae7349f7d18f6ea200c6e94c98 /src/app/app.pro | |
| parent | 8662d0a9c036f5ca8128f048421bd9be6249a1b8 (diff) | |
macOS: Remove prifile.icns
Originally, Qt Creator was able to just open .pri and .pro files as
projects. Therefore, we have a profile.icns and a prifile.icns document
type icon.
These days, however, Qt Creator can open many more kinds of project
types. Having exaclty these two icons does not make sense, any more.
This change removes the prifile.icns icon and, so that profile.icon is
used for .pri files.
As a next step, we will rename profile.icns to project.icns and remove
the extension text on the icon.
Change-Id: I444292d7996aaac8f1f892acc5b2f4ae7ccef3ee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/app/app.pro')
| -rw-r--r-- | src/app/app.pro | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index a64c357020..08af263b47 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -28,36 +28,10 @@ win32 { RC_FILE = qtcreator.rc } else:macx { LIBS += -framework CoreFoundation - 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.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 $$QMAKE_MACOSX_DEPLOYMENT_TARGET \ - --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_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 infoplist = $$cat($$PWD/app-Info.plist, blob) infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET) |