Allow long-running commands to be canceled.

At the moment, canceling a build waits for the current
command to finish, which means that a badly behaving process
or piece of JavaScript code can block qbs indefinitely.

Task-number: QBS-552
Change-Id: I8ac23f068dd6083905a9681097da6b970c0b646b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 6 insertions, 13 deletions

diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp
index 1ad82cdb5..e2ed11ba2 100644
--- a/src/lib/corelib/buildgraph/executorjob.cpp
+++ b/src/lib/corelib/buildgraph/executorjob.cpp
@@ -96,18 +96,9 @@ void ExecutorJob::run(Transformer *t)
 
 void ExecutorJob::cancel()
 {
-    if (!m_transformer)
-        return;
-    if (m_currentCommandIdx < m_transformer->commands.count() - 1) {
-        m_error = ErrorInfo(tr("Transformer execution canceled."));
-        m_currentCommandIdx = m_transformer->commands.count();
-    }
-}
-
-void ExecutorJob::waitForFinished()
-{
-    if (m_currentCommandExecutor)
-        m_currentCommandExecutor->waitForFinished();
+    QBS_ASSERT(m_currentCommandExecutor, return);
+    m_error = ErrorInfo(tr("Transformer execution canceled."));
+    m_currentCommandExecutor->cancel();
 }
 
 void ExecutorJob::runNextCommand()
@@ -137,7 +128,9 @@ void ExecutorJob::runNextCommand()
 void ExecutorJob::onCommandFinished(const ErrorInfo &err)
 {
     QBS_ASSERT(m_transformer, return);
-    if (err.hasError()) {
+    if (m_error.hasError()) { // Canceled?
+        setFinished();
+    } else if (err.hasError()) {
         m_error = err;
         setFinished();
     } else {