aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-07-21 11:49:55 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-07-21 12:27:50 +0200
commit2cbbe6c6141572500e137acbfd8104328e6dbded (patch)
tree731296bcaa7623e00f3e799d8f620e8b81580073 /src/lib/corelib/buildgraph
parent847020fb6d2b943d3e09bcc9a99b340b5821297e (diff)
Fix possible assertion in Executor.
We can get an exception in build() when there are already jobs running, which was not the case originally. Adapt to this. Change-Id: I6c10983f9635950d1597c2b34f1b885112f3877d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/corelib/buildgraph')
-rw-r--r--src/lib/corelib/buildgraph/executor.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 8ce3203b7..e59e1f9d5 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -130,8 +130,7 @@ void Executor::build()
try {
doBuild();
} catch (const ErrorInfo &e) {
- m_error = e;
- QTimer::singleShot(0, this, SLOT(finish()));
+ handleError(e);
}
}