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>
This commit is contained in:
Eike Ziller
2018-01-09 16:44:30 +01:00
parent 8d523f1900
commit 699dd2c426
4 changed files with 17 additions and 3 deletions

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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)

View File

@@ -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);