diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-09 16:44:30 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-10 08:45:59 +0000 |
| commit | 699dd2c426cb43060e0036f923927cc82c57ddef (patch) | |
| tree | 0b51570cce3de63ecd320b1aca59223e1cf3984a | |
| parent | 8d523f1900d0701763ce7addf13fc5dfaabbc528 (diff) | |
Make IDE name and ids configurable at build time
Make it unnecessary to hack app_version.h.in for that.
Change-Id: Ibc3bf332916ab9f293b6782d3b5a40078dbd7bcb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 4 | ||||
| -rw-r--r-- | qtcreator.pri | 4 | ||||
| -rw-r--r-- | src/app/app_version.h.in | 6 | ||||
| -rw-r--r-- | src/app/app_version_header.qbs | 6 |
4 files changed, 17 insertions, 3 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 60816c0eb0..4b4796e63a 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -19,6 +19,10 @@ Module { property string qtcreator_copyright_year: '2017' + property string ide_display_name: 'Qt Creator' + property string ide_id: 'qtcreator' + property string ide_cased_id: '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" diff --git a/qtcreator.pri b/qtcreator.pri index 39e1c8d0e3..09557fe15f 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -8,6 +8,10 @@ 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 + CONFIG += c++14 defineReplace(qtLibraryTargetName) { diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index 2c31ce0e16..547beaf9f2 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -31,9 +31,9 @@ namespace Constants { #define STRINGIFY_INTERNAL(x) #x #define STRINGIFY(x) STRINGIFY_INTERNAL(x) -const char IDE_DISPLAY_NAME[] = \"Qt Creator\"; -const char IDE_ID[] = \"qtcreator\"; -const char IDE_CASED_ID[] = \"QtCreator\"; +const char IDE_DISPLAY_NAME[] = \"$${IDE_DISPLAY_NAME}\"; +const char IDE_ID[] = \"$${IDE_ID}\"; +const char IDE_CASED_ID[] = \"$${IDE_CASED_ID}\"; #define IDE_VERSION $${QTCREATOR_VERSION} #define IDE_VERSION_STR STRINGIFY(IDE_VERSION) diff --git a/src/app/app_version_header.qbs b/src/app/app_version_header.qbs index fd55ba00c5..8bd2bc65bc 100644 --- a/src/app/app_version_header.qbs +++ b/src/app/app_version_header.qbs @@ -44,6 +44,12 @@ Product { + product.moduleProperty("qtc", "ide_version_release") + "\n"); content = content.replace("$${QTCREATOR_COPYRIGHT_YEAR}", product.moduleProperty("qtc", "qtcreator_copyright_year")); + content = content.replace("$${IDE_DISPLAY_NAME}", + product.moduleProperty("qtc", "ide_display_name")); + content = content.replace("$${IDE_ID}", + product.moduleProperty("qtc", "ide_id")); + content = content.replace("$${IDE_CASED_ID}", + product.moduleProperty("qtc", "ide_cased_id")); file = new TextFile(output.filePath, TextFile.WriteOnly); file.truncate(); file.write(content); |