diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/app_version.h.cmakein | 2 | ||||
| -rw-r--r-- | src/app/app_version.h.in | 6 | ||||
| -rw-r--r-- | src/plugins/coreplugin/versiondialog.cpp | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/app/app_version.h.cmakein b/src/app/app_version.h.cmakein index 6d69f0d5de..49abfc4ec8 100644 --- a/src/app/app_version.h.cmakein +++ b/src/app/app_version.h.cmakein @@ -45,7 +45,7 @@ const char IDE_CASED_ID[] = "${IDE_CASED_ID}"; const char IDE_VERSION_DISPLAY[] = "${IDE_VERSION_DISPLAY}"; const char IDE_VERSION_COMPAT[] = "${IDE_VERSION_COMPAT}"; const char IDE_REVISION_STR[] = "${IDE_REVISION_STR}"; -const char IDE_REVISION_URL_STR[] = "${IDE_REVISION_URL_STR}"; +const char IDE_REVISION_URL[] = "${IDE_REVISION_URL}"; // 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 4682d282ef..7a525bf211 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -56,11 +56,7 @@ 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 +const char IDE_REVISION_URL[] = \"$${IDE_REVISION_URL}\"; // changes the path where the settings are saved to #ifdef IDE_SETTINGSVARIANT diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 3ef40cb819..3730a8b8c2 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -57,8 +57,7 @@ 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_STR); + const QString revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL); const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR).left(10); ideRev = tr("<br/>From revision %1<br/>") .arg(revUrl.isEmpty() ? rev |