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 | |
parent | 3fbd210b2a74f299083306c309fedbe862ecf458 (diff) | |
download | qt-creator-59ac67c0bb6b2fa999bce830e0ba590ef58fa0ed.tar.gz |
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')
37 files changed, 105 insertions, 13 deletions
diff --git a/src/app/Info.plist.in b/src/app/Info.plist index df86bace5f..62cb264e8b 100644 --- a/src/app/Info.plist.in +++ b/src/app/Info.plist @@ -235,7 +235,7 @@ <key>NSHumanReadableCopyright</key> <string>(C) 2015 The Qt Company Ltd</string> <key>CFBundleIconFile</key> - <string>$$ICON</string> + <string>qtcreator</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> @@ -245,9 +245,9 @@ <key>CFBundleIdentifier</key> <string>org.qt-project.qtcreator</string> <key>CFBundleVersion</key> - <string>$$QTCREATOR_VERSION</string> + <string>@FULL_VERSION@</string> <key>CFBundleShortVersionString</key> - <string>$$QTCREATOR_VERSION</string> + <string>@SHORT_VERSION@</string> <key>LSMinimumSystemVersion</key> <string>10.7.0</string> </dict> 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 diff --git a/src/app/app.qbs b/src/app/app.qbs index 59034b7191..48db918c13 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -1,9 +1,20 @@ import qbs QtcProduct { + Depends { name: "bundle" } + Depends { name: "ib"; condition: qbs.targetOS.contains("osx") } + + bundle.isBundle: true + bundle.infoPlistFile: "Info.plist" + + ib.appIconName: "qtcreator" + type: ["application"] name: project.ide_app_target consoleApplication: qbs.debugInformation + version: project.qtcreator_version + + installSourceBase: buildDirectory cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"] : ["$ORIGIN/../" + project.libDirName + "/qtcreator"] @@ -18,7 +29,9 @@ QtcProduct { Depends { name: "ExtensionSystem" } files: [ + "Info.plist", "main.cpp", + "qtcreator.xcassets", "qtcreator.rc", "../shared/qtsingleapplication/qtsingleapplication.h", "../shared/qtsingleapplication/qtsingleapplication.cpp", @@ -54,8 +67,8 @@ QtcProduct { } Group { - fileTagsFilter: product.type + fileTagsFilter: ["infoplist", "pkginfo", "compiled_assetcatalog"] qbs.install: true - qbs.installDir: project.ide_bin_path + qbs.installSourceBase: installSourceBase } } diff --git a/src/app/prifile.icns b/src/app/prifile.icns Binary files differdeleted file mode 100644 index 96386a70aa..0000000000 --- a/src/app/prifile.icns +++ /dev/null diff --git a/src/app/profile.icns b/src/app/profile.icns Binary files differdeleted file mode 100644 index 40a881dac9..0000000000 --- a/src/app/profile.icns +++ /dev/null diff --git a/src/app/qtcreator.icns b/src/app/qtcreator.icns Binary files differdeleted file mode 100644 index 234075f2de..0000000000 --- a/src/app/qtcreator.icns +++ /dev/null diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png Binary files differnew file mode 100644 index 0000000000..0b840fb6d0 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png Binary files differnew file mode 100644 index 0000000000..0bd512dc57 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png Binary files differnew file mode 100644 index 0000000000..ade232df4a --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png Binary files differnew file mode 100644 index 0000000000..a378d48989 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png Binary files differnew file mode 100644 index 0000000000..0bd512dc57 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png Binary files differnew file mode 100644 index 0000000000..400cea7478 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png Binary files differnew file mode 100644 index 0000000000..a378d48989 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png Binary files differnew file mode 100644 index 0000000000..a00f700602 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png Binary files differnew file mode 100644 index 0000000000..400cea7478 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png Binary files differnew file mode 100644 index 0000000000..0b936d31d4 --- /dev/null +++ b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png Binary files differnew file mode 100644 index 0000000000..a5ec17d364 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png Binary files differnew file mode 100644 index 0000000000..8526bc8a71 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png Binary files differnew file mode 100644 index 0000000000..ade232df4a --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png Binary files differnew file mode 100644 index 0000000000..f90a05da4d --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png Binary files differnew file mode 100644 index 0000000000..8526bc8a71 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png Binary files differnew file mode 100644 index 0000000000..fab3805ff8 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png Binary files differnew file mode 100644 index 0000000000..f90a05da4d --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png Binary files differnew file mode 100644 index 0000000000..84dfa9f95f --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png Binary files differnew file mode 100644 index 0000000000..fab3805ff8 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png Binary files differnew file mode 100644 index 0000000000..cc62998733 --- /dev/null +++ b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/Contents.json b/src/app/qtcreator.xcassets/qtcreator.appiconset/Contents.json new file mode 100644 index 0000000000..7cd4f8e120 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256@2x.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png Binary files differnew file mode 100644 index 0000000000..b4e8673154 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png Binary files differnew file mode 100644 index 0000000000..b7aced53f6 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png Binary files differnew file mode 100644 index 0000000000..f44ede5d91 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png Binary files differnew file mode 100644 index 0000000000..5bf7644f10 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png Binary files differnew file mode 100644 index 0000000000..b7aced53f6 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png Binary files differnew file mode 100644 index 0000000000..6ff06c07fd --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png Binary files differnew file mode 100644 index 0000000000..29a67cb01c --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png Binary files differnew file mode 100644 index 0000000000..ec5da2d4c1 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png Binary files differnew file mode 100644 index 0000000000..6ff06c07fd --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png Binary files differnew file mode 100644 index 0000000000..d6f3e6e450 --- /dev/null +++ b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png |