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

Git: Use QVersionNumber for git version

Browse Source 
Parse the version string with base 10 now.

Amends abee98b44817d1aee63b5cd9b673d0c3aa1733ba

Change-Id: I2f0b47380a9714b3f3de475ddabe78875db3b608
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-20 14:10:06 +01:00
parent cd4f62ebf8
commit 98c0e9764a
6 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitplugin.cpp
View File

@@ -132,7 +132,7 @@ public:
GitLogEditorWidgetT() : GitLogEditorWidget(new Editor) {}
};
const unsigned minimumRequiredVersion = 0x010900;
static const QVersionNumber minimumRequiredVersion{1, 9};
const VcsBaseSubmitEditorParameters submitParameters {
Git::Constants::SUBMIT_MIMETYPE,
@@ -1306,8 +1306,8 @@ void GitPluginPrivate::updateVersionWarning()
QPointer<IDocument> curDocument = EditorManager::currentDocument();
if (!curDocument)
return;
Utils::onResultReady(gitClient().gitVersion(), this, [curDocument](unsigned version) {
if (!curDocument || !version || version >= minimumRequiredVersion)
Utils::onResultReady(gitClient().gitVersion(), this, [curDocument](const QVersionNumber &version) {
if (!curDocument || version.isNull() || version >= minimumRequiredVersion)
return;
InfoBar *infoBar = curDocument->infoBar();
Id gitVersionWarning("GitVersionWarning");
@@ -1316,7 +1316,7 @@ void GitPluginPrivate::updateVersionWarning()
infoBar->addInfo(
InfoBarEntry(gitVersionWarning,
Tr::tr("Unsupported version of Git found. Git %1 or later required.")
.arg(versionString(minimumRequiredVersion)),
.arg(minimumRequiredVersion.toString()),
InfoBarEntry::GlobalSuppression::Enabled));
});
}