diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-08-21 15:39:32 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-10-21 16:18:51 +0000 |
| commit | 59ac67c0bb6b2fa999bce830e0ba590ef58fa0ed (patch) | |
| tree | 91fd11132cce248ecca89723c76f4e53e403d8f5 /src/app/app.pro | |
| parent | 3fbd210b2a74f299083306c309fedbe862ecf458 (diff) | |
Qbs: properly install Info.plist, PkgInfo, and app icon.
The icns files have also been moved into an asset catalog because
"source code" as a rule should be stored in the preferred form of
modification.
Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/app/app.pro')
| -rw-r--r-- | src/app/app.pro | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index 496d2ebe35..37344af1d2 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -5,6 +5,7 @@ TEMPLATE = app CONFIG += qtc_runnable TARGET = $$IDE_APP_TARGET DESTDIR = $$IDE_APP_PATH +VERSION = $$QTCREATOR_VERSION QT -= testlib HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h @@ -24,20 +25,30 @@ win32 { INSTALLS += target } else:macx { LIBS += -framework CoreFoundation - ICON = qtcreator.icns - FILETYPES.files = profile.icns prifile.icns - FILETYPES.path = Contents/Resources - QMAKE_BUNDLE_DATA += FILETYPES - info.input = Info.plist.in - info.output = $$IDE_BIN_PATH/../Info.plist - QMAKE_SUBSTITUTES = info + ASSETCATALOG.files = $$PWD/qtcreator.xcassets + macx-xcode { + QMAKE_BUNDLE_DATA += ASSETCATALOG + } else { + ASSETCATALOG.output = $$IDE_BIN_PATH/../Resources/qtcreator.icns + ASSETCATALOG.commands = xcrun actool \ + --app-icon qtcreator \ + --output-partial-info-plist /dev/null \ + --platform macosx \ + --minimum-deployment-target 10.7 \ + --compile $$shell_quote($$IDE_BIN_PATH/../Resources) \ + $$shell_quote($$PWD/qtcreator.xcassets) + ASSETCATALOG.input = ASSETCATALOG.files + ASSETCATALOG.CONFIG += no_link + QMAKE_EXTRA_COMPILERS += ASSETCATALOG + } + QMAKE_INFO_PLIST = Info.plist } else { target.path = $$INSTALL_BIN_PATH INSTALLS += target } DISTFILES += qtcreator.rc \ - Info.plist.in \ + Info.plist \ $$PWD/app_version.h.in QMAKE_SUBSTITUTES += $$PWD/app_version.h.in |