diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-21 14:47:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-21 17:28:15 +0200 |
| commit | 7d139d7f0dcf467dfc7e9f53bc215bf00b9be505 (patch) | |
| tree | 1f836e6f699f12888206e0da76dad79080b80214 | |
| parent | 434ee46f8121d8a16a4e94dd6fedace56f799adf (diff) | |
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 <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/corelib/buildgraph/jscommandexecutor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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() |