diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2025-01-28 13:16:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2025-01-28 13:16:57 +0100 |
| commit | 3032fd5794009804cd6e2445bcc18fe5efafda2c (patch) | |
| tree | 8b15be9a948a6af6d6104a89e7ae6002bf532100 /src/plugins/git/gitplugin.cpp | |
| parent | 583cefd45230a1cc7ff67d37ae0c1ed5ebf236b0 (diff) | |
| parent | 8967b19121d47630b6d56ef816e02a28248d5bf8 (diff) | |
Merge remote-tracking branch 'origin/16.0'
Change-Id: Ibca9430f24571ff4b7adee66b9fe521a567a14ca
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index fe0a9d9c917..b4e9a06b74f 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -44,7 +44,6 @@ #include <utils/action.h> #include <utils/algorithm.h> -#include <utils/async.h> #include <utils/commandline.h> #include <utils/fileutils.h> #include <utils/infobar.h> @@ -135,8 +134,6 @@ public: GitLogEditorWidgetT() : GitLogEditorWidget(new Editor) {} }; -static const QVersionNumber minimumRequiredVersion{1, 9}; - // GitPlugin class GitPluginPrivate final : public VersionControlBase @@ -296,7 +293,6 @@ public: void cleanCommitMessageFile(); void cleanRepository(const FilePath &directory); void applyPatch(const FilePath &workingDirectory, QString file = {}); - void updateVersionWarning(); void instantBlameOnce(); @@ -1382,26 +1378,6 @@ void GitPluginPrivate::startCommit(CommitType commitType) openSubmitEditor(m_commitMessageFileName, data); } -void GitPluginPrivate::updateVersionWarning() -{ - QPointer<IDocument> curDocument = EditorManager::currentDocument(); - if (!curDocument) - return; - Utils::onResultReady(gitClient().gitVersion(), this, [curDocument](const QVersionNumber &version) { - if (!curDocument || version.isNull() || version >= minimumRequiredVersion) - return; - InfoBar *infoBar = curDocument->infoBar(); - Id gitVersionWarning("GitVersionWarning"); - if (!infoBar->canInfoBeAdded(gitVersionWarning)) - return; - infoBar->addInfo( - InfoBarEntry(gitVersionWarning, - Tr::tr("Unsupported version of Git found. Git %1 or later required.") - .arg(minimumRequiredVersion.toString()), - InfoBarEntry::GlobalSuppression::Enabled)); - }); -} - void GitPluginPrivate::instantBlameOnce() { m_instantBlame.once(); @@ -1715,8 +1691,6 @@ void GitPluginPrivate::updateActions(VersionControlBase::ActionState as) m_commandLocator->setEnabled(repositoryEnabled); if (!enableMenuAction(as, m_menuAction)) return; - if (repositoryEnabled) - updateVersionWarning(); // Note: This menu is visible if there is no repository. Only // 'Create Repository'/'Show' actions should be available. const QString fileName = Utils::quoteAmpersands(state.currentFileName()); |