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

Fix link on commit sha in about dialog

Browse Source 
Passing a URL via defines breaks when trying to "stringify" it.
It would always stop at the first slash.
Instead use a qmake variable directly. That has the additional advantage that
the value isn't passed on each and every compiler command line.

Change-Id: I97a297fbcdee5ea03eb6fa08181c95b1ad2de767
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-03-19 16:02:44 +01:00
parent 549b2f6092
commit 9eceb46739
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_cmake.yml vendored
View File

@@ -333,7 +333,7 @@ jobs:
-D WITH_TESTS=ON -D WITH_TESTS=ON
-D IDE_REVISION=TRUE -D IDE_REVISION=TRUE
-D IDE_REVISION_STR=$ENV{GITHUB_SHA} -D IDE_REVISION_STR=$ENV{GITHUB_SHA}
-D IDE_REVISION_URL_STR=https://github.com/$ENV{GITHUB_REPOSITORY}/commits/$ENV{GITHUB_SHA} -D IDE_REVISION_URL=https://github.com/$ENV{GITHUB_REPOSITORY}/commits/$ENV{GITHUB_SHA}
RESULT_VARIABLE result RESULT_VARIABLE result
COMMAND_ECHO STDOUT COMMAND_ECHO STDOUT
) )

4
CMakeLists.txt
View File

@@ -8,9 +8,9 @@ include(QtCreatorIDEBranding)
set(IDE_REVISION FALSE CACHE BOOL "Marks the presence of IDE revision string.") set(IDE_REVISION FALSE CACHE BOOL "Marks the presence of IDE revision string.")
set(IDE_REVISION_STR "" CACHE STRING "The IDE revision string.") set(IDE_REVISION_STR "" CACHE STRING "The IDE revision string.")
set(IDE_REVISION_URL_STR "" CACHE STRING "The IDE revision Url string.") set(IDE_REVISION_URL "" CACHE STRING "The IDE revision Url string.")
mark_as_advanced(IDE_REVISION IDE_REVISION_STR IDE_REVISION_URL_STR) mark_as_advanced(IDE_REVISION IDE_REVISION_STR IDE_REVISION_URL)
project(QtCreator VERSION ${IDE_VERSION}) project(QtCreator VERSION ${IDE_VERSION})

2
scripts/build.py
View File

@@ -131,7 +131,7 @@ def build_qtcreator(args, paths):
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,
'-DIDE_REVISION_URL_STR=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]
common.check_print_call(cmake_args + [paths.src], paths.build) common.check_print_call(cmake_args + [paths.src], paths.build)
common.check_print_call(['cmake', '--build', '.'], paths.build) common.check_print_call(['cmake', '--build', '.'], paths.build)

2
src/app/app_version.h.cmakein
View File

@@ -45,7 +45,7 @@ const char IDE_CASED_ID[] = "${IDE_CASED_ID}";
const char IDE_VERSION_DISPLAY[] = "${IDE_VERSION_DISPLAY}"; const char IDE_VERSION_DISPLAY[] = "${IDE_VERSION_DISPLAY}";
const char IDE_VERSION_COMPAT[] = "${IDE_VERSION_COMPAT}"; const char IDE_VERSION_COMPAT[] = "${IDE_VERSION_COMPAT}";
const char IDE_REVISION_STR[] = "${IDE_REVISION_STR}"; 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 // changes the path where the settings are saved to
const char IDE_SETTINGSVARIANT_STR[] = "${IDE_SETTINGSVARIANT}"; const char IDE_SETTINGSVARIANT_STR[] = "${IDE_SETTINGSVARIANT}";

6
src/app/app_version.h.in
View File

@@ -56,11 +56,7 @@ const char IDE_REVISION_STR[] = STRINGIFY(IDE_REVISION);
const char IDE_REVISION_STR[] = \"\"; const char IDE_REVISION_STR[] = \"\";
#endif #endif
#ifdef IDE_REVISION_URL const char IDE_REVISION_URL[] = \"$${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 // changes the path where the settings are saved to
#ifdef IDE_SETTINGSVARIANT #ifdef IDE_SETTINGSVARIANT

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

@@ -57,8 +57,7 @@ VersionDialog::VersionDialog(QWidget *parent)
QString ideRev; QString ideRev;
#ifdef IDE_REVISION #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 revUrl = QString::fromLatin1(Constants::IDE_REVISION_URL_STR);
const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR).left(10); const QString rev = QString::fromLatin1(Constants::IDE_REVISION_STR).left(10);
ideRev = tr("<br/>From revision %1<br/>") ideRev = tr("<br/>From revision %1<br/>")
.arg(revUrl.isEmpty() ? rev .arg(revUrl.isEmpty() ? rev