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

RunControl: Fix 'Stop'

Browse Source 
Terminate/kill current runners, so that the GUI will reflect that quite
soon and not if all runners finished.

Change-Id: I83eed6ecf1678444a8b38bab6cc05d8694a4eb49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-10-28 09:44:26 +01:00
parent cb49d04f46
commit 4acbedf841
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
View File

@@ -84,8 +84,13 @@ ClangStaticAnalyzerRunner::ClangStaticAnalyzerRunner(const QString &clangExecuta
ClangStaticAnalyzerRunner::~ClangStaticAnalyzerRunner()
{
const QProcess::ProcessState processState = m_process.state();
if (processState == QProcess::Starting || processState == QProcess::Running)
m_process.kill();
if (processState == QProcess::Starting || processState == QProcess::Running) {
m_process.terminate();
if (!m_process.waitForFinished(500)) {
m_process.kill();
m_process.waitForFinished();
}
}
}
bool ClangStaticAnalyzerRunner::run(const QString &filePath, const QStringList &compilerOptions)