aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-06-22 16:14:35 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-06-22 15:05:48 +0000
commit7e0191856b3c76517a2654183b52192713ff5770 (patch)
treebbad0dd36d552f572d9faade7350dae8736f3f34 /src/lib/corelib/buildgraph
parent59bbb6ffe0a4529b7a87538550b63bb63563613b (diff)
Executor: Do not convert error objects into stringsv1.8.1
Command line users do not see a difference, but for IDE users it is important that we keep error message and code location separate in the ErrorInfo objects we hand out via the API. Task-number: QBS-1151 Change-Id: I4aacf2f32ee535c2d37da3d615ab78e2777a351a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph')
-rw-r--r--src/lib/corelib/buildgraph/executor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index b95f9ea5a..29b963778 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -723,7 +723,8 @@ void Executor::doSanityChecks()
void Executor::handleError(const ErrorInfo &error)
{
- m_error.append(error.toString());
+ for (const ErrorItem &ei : error.items())
+ m_error.append(ei);
if (m_processingJobs.isEmpty())
finish();
else