From d30bb927041adfeb59b1c76d2472c7e712dd11a6 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 25 Jul 2023 17:09:48 +0200
Subject: [PATCH] GitPlugin: Use PluginManager's futureSynchronizer

It's being deleted on plugin unload, so it should be
a proper substitute.

Change-Id: I27383db72dfa0d5b0df2886b24c96266602ccbac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/git/gitclient.cpp       | 5 -----
 src/plugins/git/gitclient.h         | 4 ----
 src/plugins/git/gitsubmiteditor.cpp | 3 ++-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index bd0b037cdaf..f544ad30b9b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3099,11 +3099,6 @@ void GitClient::handleMergeConflicts(const FilePath &workingDir, const QString &
     }
 }
 
-void GitClient::addFuture(const QFuture<void> &future)
-{
-    m_synchronizer.addFuture(future);
-}
-
 // Subversion: git svn
 void GitClient::synchronousSubversionFetch(const FilePath &workingDirectory) const
 {
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 3604eb9f3cf..f0875bed8ff 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -12,7 +12,6 @@
 #include <vcsbase/vcsbaseclient.h>
 
 #include <utils/fileutils.h>
-#include <utils/futuresynchronizer.h>
 #include <utils/process.h>
 
 #include <QObject>
@@ -331,7 +330,6 @@ public:
     bool isValidRevision(const QString &revision) const;
     void handleMergeConflicts(const Utils::FilePath &workingDir, const QString &commit,
                               const QStringList &files, const QString &abortCommand);
-    void addFuture(const QFuture<void> &future);
 
     static QString msgNoChangedFiles();
     static QString msgNoCommits(bool includeRemote);
@@ -406,8 +404,6 @@ private:
     QString m_diffCommit;
     Utils::FilePaths m_updatedSubmodules;
     bool m_disableEditor = false;
-    // The synchronizer has cancelOnWait set to true by default.
-    Utils::FutureSynchronizer m_synchronizer; // for commit updates
 };
 
 class GitRemote : public Core::IVersionControl::RepoUrl
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 9ff83c8c124..88bc91616f7 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -11,6 +11,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/async.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/submitfilemodel.h>
@@ -209,7 +210,7 @@ void GitSubmitEditor::updateFileModel()
     Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"),
                                    TASK_UPDATE_COMMIT);
 
-    GitClient::instance()->addFuture(QFuture<void>(m_fetchWatcher.future()));
+    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_fetchWatcher.future());
 }
 
 void GitSubmitEditor::forceUpdateFileModel()