aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-04-23 16:18:48 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-04-24 12:08:28 +0200
commit3b6628bded8316bfca98865005d51cfc33b60198 (patch)
tree05fc2beee95bcf35fa2f891c682da915d2a56a7f
parenta622d68f2a4d87b1571611c388870ba047877e4a (diff)
Remove invalid assertion.
The asserted condition is actually not required to be true. Change-Id: I7609a8551e0c0906ebbb6649c5966ff1a90272fb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/lib/corelib/buildgraph/executorjob.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp
index e2ed11ba2..8fa420526 100644
--- a/src/lib/corelib/buildgraph/executorjob.cpp
+++ b/src/lib/corelib/buildgraph/executorjob.cpp
@@ -96,7 +96,8 @@ void ExecutorJob::run(Transformer *t)
void ExecutorJob::cancel()
{
- QBS_ASSERT(m_currentCommandExecutor, return);
+ if (!m_currentCommandExecutor)
+ return;
m_error = ErrorInfo(tr("Transformer execution canceled."));
m_currentCommandExecutor->cancel();
}