summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-01-28 17:04:03 +0100
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-01-29 12:37:04 +0200
commit570e62b1683f3c879b58a9a3a737bd516b09f032 (patch)
treed7b7b2331ee9dcad3a25d7c81cceebf22ecd48aa
parent0d60463c67c0df7d60bb93c0dbef0b099d3295e3 (diff)
downloadqt-creator-570e62b1683f3c879b58a9a3a737bd516b09f032.tar.gz
RunControl: Reset future interface before in startEngine()
This fixes an infinite loop for the following use case: 1. Menu: Analyze > Clang Static Analzyer 2. When finished, click "Re-run this run-configuration" in the application output pane m_progress was left in the isFinished() state and the next run to startEngine() called analyzeNextFile() which returned immediately. Change-Id: I8acf4f03dfc1d7f81034610828f6fb707655bd52 Sanity-Review: Sanity Bot <srv.sanitybot@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
-rw-r--r--plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index f9b3506102..75757bc916 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -211,6 +211,7 @@ bool ClangStaticAnalyzerRunControl::startEngine()
// Set up progress information
using namespace Core;
+ m_progress = QFutureInterface<void>();
FutureProgress *futureProgress
= ProgressManager::addTask(m_progress.future(), tr("Analyzing"), "ClangStaticAnalyzer");
futureProgress->setKeepOnFinish(FutureProgress::HideOnFinish);