Make executable name configurable

Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

qbs/modules/qtc/qtc.qbs

@@ -23,10 +23,11 @@ Module {
     property string ide_display_name: 'Qt Creator'
     property string ide_id: 'qtcreator'
     property string ide_cased_id: 'QtCreator'
+    property string ide_bundle_identifier: 'org.qt-project.qtcreator'
 
     property string libDirName: "lib"
     property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin"
-    property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator"
+    property string ide_app_target: qbs.targetOS.contains("macos") ? ide_display_name : ide_id
     property string ide_library_path: {
         if (qbs.targetOS.contains("macos"))
             return ide_app_target + ".app/Contents/Frameworks"

qtcreator.pri

@@ -8,9 +8,11 @@ QTCREATOR_DISPLAY_VERSION = 4.6.0-beta1
 QTCREATOR_COPYRIGHT_YEAR = 2017
 BINARY_ARTIFACTS_BRANCH = master
 
-isEmpty(IDE_DISPLAY_NAME): IDE_DISPLAY_NAME = Qt Creator
-isEmpty(IDE_ID):           IDE_ID = qtcreator
-isEmpty(IDE_CASED_ID):     IDE_CASED_ID = QtCreator
+isEmpty(IDE_DISPLAY_NAME):           IDE_DISPLAY_NAME = Qt Creator
+isEmpty(IDE_ID):                     IDE_ID = qtcreator
+isEmpty(IDE_CASED_ID):               IDE_CASED_ID = QtCreator
+
+isEmpty(PRODUCT_BUNDLE_IDENTIFIER): PRODUCT_BUNDLE_IDENTIFIER = org.qt-project.$$IDE_ID
 
 CONFIG += c++14
 
@@ -100,7 +102,7 @@ isEmpty(IDE_BUILD_TREE) {
 
 IDE_APP_PATH = $$IDE_BUILD_TREE/bin
 osx {
-    IDE_APP_TARGET   = "Qt Creator"
+    IDE_APP_TARGET   = "$$IDE_DISPLAY_NAME"
 
     # check if IDE_BUILD_TREE is actually an existing Qt Creator.app,
     # for building against a binary package
@@ -130,7 +132,7 @@ osx {
     INSTALL_APP_PATH     = $$QTC_PREFIX/
 } else {
     contains(TEMPLATE, vc.*):vcproj = 1
-    IDE_APP_TARGET   = qtcreator
+    IDE_APP_TARGET   = $$IDE_ID
 
     # target output path if not set manually
     isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_BUILD_TREE

src/app/app-Info.plist

@@ -245,9 +245,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>Qt Creator</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.qt-project.qtcreator</string>
+	<string>@PRODUCT_BUNDLE_IDENTIFIER@</string>
 	<key>CFBundleVersion</key>
 	<string>@FULL_VERSION@</string>
 	<key>CFBundleShortVersionString</key>

src/app/app.pro

@@ -62,6 +62,7 @@ win32 {
     infoplist = $$cat($$PWD/app-Info.plist, blob)
     infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET)
     infoplist = $$replace(infoplist, @QTCREATOR_COPYRIGHT_YEAR@, $$QTCREATOR_COPYRIGHT_YEAR)
+    infoplist = $$replace(infoplist, @PRODUCT_BUNDLE_IDENTIFIER@, $$PRODUCT_BUNDLE_IDENTIFIER)
     write_file($$OUT_PWD/Info.plist, infoplist)
 
     QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist

src/app/app.qbs

@@ -26,6 +26,7 @@ QtcProduct {
     installSourceBase: isBundle ? buildDirectory : base
     property bool qtcRunnable: true
 
+    bundle.identifier: qtc.ide_bundle_identifier
     bundle.infoPlist: ({
         "NSHumanReadableCopyright": qtc.qtcreator_copyright_string
     })