From 7d139d7f0dcf467dfc7e9f53bc215bf00b9be505 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 21 Jul 2014 14:47:55 +0200 Subject: Fix JS command canceling for the "dry run" case. No JavaScript is ever run, so it cannot be canceled either. Change-Id: I322b2b1bb599273562f60028c07ac6bb09b4dd66 Reviewed-by: Joerg Bornemann --- src/lib/corelib/buildgraph/jscommandexecutor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp index a29b5903a..4a7417820 100644 --- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp @@ -189,7 +189,8 @@ void JsCommandExecutor::doStart() void JsCommandExecutor::cancel() { - QMetaObject::invokeMethod(m_objectInThread, "cancel", Qt::QueuedConnection); + if (!dryRun()) + QMetaObject::invokeMethod(m_objectInThread, "cancel", Qt::QueuedConnection); } void JsCommandExecutor::onJavaScriptCommandFinished() -- cgit v1.2.3