Valgrind: Remove unneeded separate FutureWatcher

Change-Id: I21fde2125a4a5d653fe4209e3452dec59c783d24
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

2 files changed, 2 insertions, 7 deletions

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index d03f016a3d..9cc5d2c98e 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -60,7 +60,6 @@ ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
     : AnalyzerRunControl(sp, runConfiguration),
       m_settings(0),
       m_progress(new QFutureInterface<void>()),
-      m_progressWatcher(new QFutureWatcher<void>()),
       m_isStopping(false)
 {
     if (runConfiguration)
@@ -70,10 +69,6 @@ ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
     if (!m_settings)
         m_settings = ValgrindPlugin::globalSettings();
 
-    connect(m_progressWatcher, SIGNAL(canceled()),
-            this, SLOT(handleProgressCanceled()));
-    connect(m_progressWatcher, SIGNAL(finished()),
-            this, SLOT(handleProgressFinished()));
 }
 
 ValgrindRunControl::~ValgrindRunControl()
@@ -88,9 +83,10 @@ bool ValgrindRunControl::startEngine()
     FutureProgress *fp = ProgressManager::addTask(m_progress->future(),
                                                         progressTitle(), "valgrind");
     fp->setKeepOnFinish(FutureProgress::HideOnFinish);
+    connect(fp, SIGNAL(canceled()), this, SLOT(handleProgressCanceled()));
+    connect(fp, SIGNAL(finished()), this, SLOT(handleProgressFinished()));
     m_progress->setProgressRange(0, progressMaximum);
     m_progress->reportStarted();
-    m_progressWatcher->setFuture(m_progress->future());
     m_progress->setProgressValue(progressMaximum / 10);
 
     const AnalyzerStartParameters &sp = startParameters();
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index 6aa48aa8dc..0c6c2fb808 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -63,7 +63,6 @@ protected:
 
     ValgrindBaseSettings *m_settings;
     QFutureInterface<void> *m_progress;
-    QFutureWatcher<void> *m_progressWatcher;
 
 private slots:
     void handleProgressCanceled();