feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make executable name configurable

Browse Source 
Change-Id: I6b5420ab2275c37e51f665005e31b80b6dfae8cb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Eike Ziller
2018-01-11 15:59:11 +01:00
parent 61b5bbc8e9
commit 7872ddde4c
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qbs/modules/qtc/qtc.qbs
View File

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

12
qtcreator.pri
View File

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

4
src/app/app-Info.plist
View File

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

1
src/app/app.pro
View File

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

1
src/app/app.qbs
View File

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