diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index d38b7b0ecbb..10e9fa09377 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -3,6 +3,7 @@ import QtcFunctions Product { property string installDir + property string installSourceBase Depends { name: "cpp" } cpp.defines: project.generalDefines @@ -23,5 +24,6 @@ Product { fileTagsFilter: product.type qbs.install: true qbs.installDir: installDir + qbs.installSourceBase: installSourceBase } } diff --git a/qtcreator.qbs b/qtcreator.qbs index 85d0caff587..f051ab2db3c 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -2,7 +2,7 @@ import qbs 1.0 Project { name: "Qt Creator" - minimumQbsVersion: "1.4" + minimumQbsVersion: "1.4.3" property bool withAutotests: qbs.buildVariant === "debug" property string ide_version_major: '3' property string ide_version_minor: '5' diff --git a/src/app/Info.plist.in b/src/app/Info.plist similarity index 98% rename from src/app/Info.plist.in rename to src/app/Info.plist index df86bace5f7..62cb264e8b1 100644 --- a/src/app/Info.plist.in +++ b/src/app/Info.plist @@ -235,7 +235,7 @@ NSHumanReadableCopyright (C) 2015 The Qt Company Ltd CFBundleIconFile - $$ICON + qtcreator CFBundlePackageType APPL CFBundleSignature @@ -245,9 +245,9 @@ CFBundleIdentifier org.qt-project.qtcreator CFBundleVersion - $$QTCREATOR_VERSION + @FULL_VERSION@ CFBundleShortVersionString - $$QTCREATOR_VERSION + @SHORT_VERSION@ LSMinimumSystemVersion 10.7.0 diff --git a/src/app/app.pro b/src/app/app.pro index 496d2ebe35c..37344af1d20 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 59034b7191c..48db918c13b 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 deleted file mode 100644 index 96386a70aa4..00000000000 Binary files a/src/app/prifile.icns and /dev/null differ diff --git a/src/app/profile.icns b/src/app/profile.icns deleted file mode 100644 index 40a881dac9e..00000000000 Binary files a/src/app/profile.icns and /dev/null differ diff --git a/src/app/qtcreator.icns b/src/app/qtcreator.icns deleted file mode 100644 index 234075f2de4..00000000000 Binary files a/src/app/qtcreator.icns and /dev/null differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png new file mode 100644 index 00000000000..0b840fb6d03 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png new file mode 100644 index 00000000000..0bd512dc57c Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_128x128@2x.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png new file mode 100644 index 00000000000..ade232df4a0 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png new file mode 100644 index 00000000000..a378d489897 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_16x16@2x.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png new file mode 100644 index 00000000000..0bd512dc57c Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png new file mode 100644 index 00000000000..400cea74789 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_256x256@2x.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png new file mode 100644 index 00000000000..a378d489897 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png new file mode 100644 index 00000000000..a00f7006022 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_32x32@2x.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png new file mode 100644 index 00000000000..400cea74789 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512.png differ diff --git a/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png new file mode 100644 index 00000000000..0b936d31d47 Binary files /dev/null and b/src/app/qtcreator.xcassets/prifile.iconset/icon_512x512@2x.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png new file mode 100644 index 00000000000..a5ec17d3649 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png new file mode 100644 index 00000000000..8526bc8a71a Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_128x128@2x.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png new file mode 100644 index 00000000000..ade232df4a0 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png new file mode 100644 index 00000000000..f90a05da4d7 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_16x16@2x.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png new file mode 100644 index 00000000000..8526bc8a71a Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png new file mode 100644 index 00000000000..fab3805ff88 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_256x256@2x.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png new file mode 100644 index 00000000000..f90a05da4d7 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png new file mode 100644 index 00000000000..84dfa9f95f6 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_32x32@2x.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png new file mode 100644 index 00000000000..fab3805ff88 Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512.png differ diff --git a/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png new file mode 100644 index 00000000000..cc62998733b Binary files /dev/null and b/src/app/qtcreator.xcassets/profile.iconset/icon_512x512@2x.png differ 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 00000000000..7cd4f8e120c --- /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 new file mode 100644 index 00000000000..b4e86731540 Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png new file mode 100644 index 00000000000..b7aced53f6c Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png new file mode 100644 index 00000000000..f44ede5d91a Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png new file mode 100644 index 00000000000..5bf7644f10d Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png new file mode 100644 index 00000000000..b7aced53f6c Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png new file mode 100644 index 00000000000..6ff06c07fd1 Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png new file mode 100644 index 00000000000..29a67cb01c5 Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png new file mode 100644 index 00000000000..ec5da2d4c1d Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png new file mode 100644 index 00000000000..6ff06c07fd1 Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png new file mode 100644 index 00000000000..d6f3e6e4501 Binary files /dev/null and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png differ