Commit 17f70460 authored by Daniel Teske's avatar Daniel Teske

BuildManager::cancel() needs to block until the step is canceled

Task-number: QTCREATORBUG-10256

Change-Id: I8e761ac072954eb1802b9b4eec415f48414b7990
Reviewed-by: default avatarJarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 8993c557
......@@ -216,8 +216,13 @@ void BuildManager::cancel()
return;
d->m_canceling = true;
d->m_watcher.cancel();
if (d->m_currentBuildStep->runInGuiThread())
if (d->m_currentBuildStep->runInGuiThread()) {
d->m_currentBuildStep->cancel();
while (d->m_canceling)
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
} else {
d->m_watcher.waitForFinished();
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment