feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move shortening of revision string to build script

Browse Source 
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>
This commit is contained in:
Alp Öz
2021-08-12 09:29:25 +02:00
parent 716efc964d
commit 344d70e8f4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build.py
View File

@@ -185,7 +185,7 @@ def build_qtcreator(args, paths):
ide_revision = common.get_commit_SHA(paths.src) ide_revision = common.get_commit_SHA(paths.src)
if ide_revision: if ide_revision:
cmake_args += ['-DIDE_REVISION=ON', 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] '-DIDE_REVISION_URL=https://code.qt.io/cgit/qt-creator/qt-creator.git/log/?id=' + ide_revision]
cmake_args += args.config_args cmake_args += args.config_args

2
src/plugins/coreplugin/versiondialog.cpp
View File

@@ -58,7 +58,7 @@ VersionDialog::VersionDialog(QWidget *parent)
QString ideRev; QString ideRev;
#ifdef IDE_REVISION #ifdef IDE_REVISION
const QString revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL); 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/>") ideRev = tr("<br/>From revision %1<br/>")
.arg(revUrl.isEmpty() ? rev .arg(revUrl.isEmpty() ? rev
: QString::fromLatin1("<a href=\"%1\">%2</a>").arg(revUrl, rev)); : QString::fromLatin1("<a href=\"%1\">%2</a>").arg(revUrl, rev));