diff options
| author | Alp Öz <aoz@qt.io> | 2021-08-12 09:29:25 +0200 |
|---|---|---|
| committer | Alp Öz <aoz@qt.io> | 2021-09-09 07:40:18 +0000 |
| commit | 344d70e8f4dad1b0cff7894c7c607fa997eeb3df (patch) | |
| tree | 7120408983fa2796c8dce8af9ed4daf616360c08 | |
| parent | 716efc964df2029861b237da3119fdc44c914ee3 (diff) | |
Move shortening of revision string to build script
This is to allow setting a longer IDE_REVISION_STR which is not necessarily a SHA256 value.
Change-Id: Iad61e87fcd92e1b96a2066a3c6a6ae51d452b9b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rwxr-xr-x | scripts/build.py | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/versiondialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build.py b/scripts/build.py index f96a9c5a3c7..25b73e1f78c 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -185,7 +185,7 @@ def build_qtcreator(args, paths): ide_revision = common.get_commit_SHA(paths.src) if ide_revision: cmake_args += ['-DIDE_REVISION=ON', - '-DIDE_REVISION_STR=' + ide_revision, + '-DIDE_REVISION_STR=' + ide_revision[:10], '-DIDE_REVISION_URL=https://code.qt.io/cgit/qt-creator/qt-creator.git/log/?id=' + ide_revision] cmake_args += args.config_args diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 3730a8b8c2b..14553cdcfc1 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -58,7 +58,7 @@ VersionDialog::VersionDialog(QWidget *parent) QString ideRev; #ifdef IDE_REVISION const QString revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL); - const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR).left(10); + const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR); ideRev = tr("<br/>From revision %1<br/>") .arg(revUrl.isEmpty() ? rev : QString::fromLatin1("<a href=\"%1\">%2</a>").arg(revUrl, rev)); |