diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 95106b1cd4d..40d0a198741 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -13,5 +13,5 @@ set(IDE_ID "qtcreator") # The IDE id (no spaces, l set(IDE_CASED_ID "QtCreator") # The cased IDE id (no spaces!) set(IDE_BUNDLE_IDENTIFIER "org.qt-project.${IDE_ID}") # The macOS application bundle identifier. -set(IDE_REVISION_URL "https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=%1") +set(IDE_REVISION_URL_STR "https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=%1") # The revision url in the version dialog diff --git a/src/app/app_version.h.cmakein b/src/app/app_version.h.cmakein index 79ac4397ce2..7fa0a830ddf 100644 --- a/src/app/app_version.h.cmakein +++ b/src/app/app_version.h.cmakein @@ -44,7 +44,7 @@ const char IDE_CASED_ID[] = "${IDE_CASED_ID}"; const char IDE_VERSION_DISPLAY[] = "${IDE_VERSION_DISPLAY}"; const char IDE_REVISION_STR[] = "${IDE_REVISION_STR}"; -const char IDE_REVISION_URL[] = "${IDE_REVISION_URL}"; +const char IDE_REVISION_URL_STR[] = "${IDE_REVISION_URL_STR}"; // changes the path where the settings are saved to const char IDE_SETTINGSVARIANT_STR[] = "${IDE_SETTINGSVARIANT}"; diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index 6af0640a08c..a3fc7f4b4ee 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -54,6 +54,12 @@ const char IDE_REVISION_STR[] = STRINGIFY(IDE_REVISION); const char IDE_REVISION_STR[] = \"\"; #endif +#ifdef IDE_REVISION_URL +const char IDE_REVISION_URL_STR[] = STRINGIFY(IDE_REVISION_URL); +#else +const char IDE_REVISION_URL_STR[] = \"\"; +#endif + // changes the path where the settings are saved to #ifdef IDE_SETTINGSVARIANT const char IDE_SETTINGSVARIANT_STR[] = STRINGIFY(IDE_SETTINGSVARIANT); diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 90897ddb1fb..eb612755010 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -59,12 +59,12 @@ VersionDialog::VersionDialog(QWidget *parent) QString ideRev; #ifdef IDE_REVISION //: This gets conditionally inserted as argument %8 into the description string. - const QString revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL); - const QString revStr = QString::fromLatin1(Constants::IDE_REVISION_STR); + const QString revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL_STR); + const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR); ideRev = tr("
From revision %1
") - .arg(revUrl.isEmpty() ? revStr.left(10) + .arg(revUrl.isEmpty() ? rev.left(10) : QString::fromLatin1("%2") - .arg(revUrl.arg(revStr), revStr.left(10))); + .arg(revUrl.arg(rev), rev.left(10))); #endif QString buildDateInfo; #ifdef QTC_SHOW_BUILD_DATE