app_version.h: Make IDE name configurable

Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

2 files changed, 20 insertions, 14 deletions

diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in
index 97fd0735a4c..2c31ce0e16f 100644
--- a/src/app/app_version.h.in
+++ b/src/app/app_version.h.in
@@ -31,6 +31,10 @@ 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\";
+
 #define IDE_VERSION $${QTCREATOR_VERSION}
 #define IDE_VERSION_STR STRINGIFY(IDE_VERSION)
 #define IDE_VERSION_DISPLAY_DEF $${QTCREATOR_DISPLAY_VERSION}
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 4888b8db580..7235796e3fd 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -66,7 +66,6 @@ using namespace ExtensionSystem;
 
 enum { OptionIndent = 4, DescriptionIndent = 34 };
 
-const char appNameC[] = "Qt Creator";
 const char corePluginNameC[] = "Core";
 const char fixedOptionsC[] =
 " [OPTION]... [FILE]...\n"
@@ -110,7 +109,7 @@ static inline QString toHtml(const QString &t)
 static void displayHelpText(const QString &t)
 {
     if (Utils::HostOsInfo::isWindowsHost())
-        QMessageBox::information(0, QLatin1String(appNameC), toHtml(t));
+        QMessageBox::information(0, QLatin1String(Core::Constants::IDE_DISPLAY_NAME), toHtml(t));
     else
         qWarning("%s", qPrintable(t));
 }
@@ -118,7 +117,7 @@ static void displayHelpText(const QString &t)
 static void displayError(const QString &t)
 {
     if (Utils::HostOsInfo::isWindowsHost())
-        QMessageBox::critical(0, QLatin1String(appNameC), t);
+        QMessageBox::critical(0, QLatin1String(Core::Constants::IDE_DISPLAY_NAME), t);
     else
         qCritical("%s", qPrintable(t));
 }
@@ -127,7 +126,7 @@ static void printVersion(const PluginSpec *coreplugin)
 {
     QString version;
     QTextStream str(&version);
-    str << '\n' << appNameC << ' ' << coreplugin->version()<< " based on Qt " << qVersion() << "\n\n";
+    str << '\n' << Core::Constants::IDE_DISPLAY_NAME << ' ' << coreplugin->version()<< " based on Qt " << qVersion() << "\n\n";
     PluginManager::formatPluginVersions(str);
     str << '\n' << coreplugin->copyright() << '\n';
     displayHelpText(version);
@@ -211,7 +210,9 @@ static inline QStringList getPluginPaths()
     pluginPath += QLatin1Char('/')
             + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR)
             + QLatin1Char('/');
-    pluginPath += QLatin1String(Utils::HostOsInfo::isMacHost() ? "Qt Creator" : "qtcreator");
+    pluginPath += QLatin1String(Utils::HostOsInfo::isMacHost() ?
+                                    Core::Constants::IDE_DISPLAY_NAME :
+                                    Core::Constants::IDE_ID);
     pluginPath += QLatin1String("/plugins/");
     pluginPath += QLatin1String(Core::Constants::IDE_VERSION_LONG);
     rc.push_back(pluginPath);
@@ -228,7 +229,7 @@ static void setupInstallSettings()
                        QCoreApplication::applicationDirPath() + '/' + RELATIVE_DATA_PATH);
     QSettings installSettings(QSettings::IniFormat, QSettings::UserScope,
                               QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR),
-                              QLatin1String("QtCreator"));
+                              QLatin1String(Core::Constants::IDE_CASED_ID));
     if (installSettings.contains(kInstallSettingsKey)) {
         QString installSettingsPath = installSettings.value(kInstallSettingsKey).toString();
         if (QDir::isRelativePath(installSettingsPath))
@@ -241,7 +242,7 @@ static QSettings *createUserSettings()
 {
     return new QSettings(QSettings::IniFormat, QSettings::UserScope,
                          QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR),
-                         QLatin1String("QtCreator"));
+                         QLatin1String(Core::Constants::IDE_CASED_ID));
 }
 
 static inline QSettings *userSettings()
@@ -276,9 +277,9 @@ static inline QSettings *userSettings()
                 || lowerFile.startsWith(QLatin1String("qtversion.xml"))
                 || lowerFile.startsWith(QLatin1String("devices.xml"))
                 || lowerFile.startsWith(QLatin1String("debuggers.xml"))
-                || lowerFile.startsWith(QLatin1String("qtcreator.")))
+                || lowerFile.startsWith(QLatin1String(Core::Constants::IDE_ID) + "."))
             QFile::copy(srcDir.absoluteFilePath(file), destDir.absoluteFilePath(file));
-        if (file == QLatin1String("qtcreator"))
+        if (file == QLatin1String(Core::Constants::IDE_ID))
             copyRecursively(srcDir.absoluteFilePath(file), destDir.absoluteFilePath(file));
     }
 
@@ -300,7 +301,7 @@ int main(int argc, char **argv)
     if (Utils::HostOsInfo::isLinuxHost())
         QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
 
-    Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/QtCreator-XXXXXX");
+    Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/" + Core::Constants::IDE_CASED_ID + "-XXXXXX");
 
     setHighDpiEnvironmentVariable();
 
@@ -316,7 +317,7 @@ int main(int argc, char **argv)
 #endif
 
     SharedTools::QtSingleApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-    SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
+    SharedTools::QtSingleApplication app((QLatin1String(Core::Constants::IDE_DISPLAY_NAME)), argc, argv);
 
     loadFonts();
 
@@ -335,7 +336,8 @@ int main(int argc, char **argv)
     QtSystemExceptionHandler systemExceptionHandler(libexecPath);
 #else
     // Display a backtrace once a serious signal is delivered (Linux only).
-    CrashHandlerSetup setupCrashHandler(appNameC, CrashHandlerSetup::EnableRestart, libexecPath);
+    CrashHandlerSetup setupCrashHandler(Core::Constants::IDE_DISPLAY_NAME,
+                                        CrashHandlerSetup::EnableRestart, libexecPath);
 #endif
 
     app.setAttribute(Qt::AA_UseHighDpiPixmaps);
@@ -384,7 +386,7 @@ int main(int argc, char **argv)
 
     QSettings *globalSettings = new QSettings(QSettings::IniFormat, QSettings::SystemScope,
                                               QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR),
-                                              QLatin1String("QtCreator"));
+                                              QLatin1String(Core::Constants::IDE_CASED_ID));
     PluginManager pluginManager;
     PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin"));
     PluginManager::setGlobalSettings(globalSettings);
@@ -401,7 +403,7 @@ int main(int argc, char **argv)
             + '/' + RELATIVE_DATA_PATH + "/translations";
     foreach (QString locale, uiLanguages) {
         locale = QLocale(locale).name();
-        if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {
+        if (translator.load(QString::fromLatin1(Core::Constants::IDE_ID) + "_" + locale, creatorTrPath)) {
             const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
             const QString &qtTrFile = QLatin1String("qt_") + locale;
             // Binary installer puts Qt tr files into creatorTrPath