Merge remote-tracking branch 'origin/1.2'

Conflicts:
	qbs_version.pri
	share/qbs/modules/cpp/GenericGCC.qbs
	version.js

Change-Id: I77e3d22cdc6f95bfa83c64a7fcfde735c6393d10

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
index e2d1e14e4..cc7eb715b 100644
--- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
@@ -181,14 +181,14 @@ void JsCommandExecutor::onJavaScriptCommandFinished()
 {
     m_running = false;
     const JavaScriptCommandResult &result = m_objectInThread->result();
+    ErrorInfo err;
     if (!result.success) {
         logger().qbsDebug() << "JS context:\n" << jsCommand()->properties();
         logger().qbsDebug() << "JS code:\n" << jsCommand()->sourceCode();
-        QString msg = tr("Error while executing JavaScriptCommand:\n");
-        msg += result.errorMessage;
-        emit finished(ErrorInfo(msg, result.errorLocation));
+        err.append(tr("Error while executing JavaScriptCommand:"), result.errorLocation);
+        err.append(result.errorMessage);
     }
-    emit finished();
+    emit finished(err);
 }
 
 const JavaScriptCommand *JsCommandExecutor::jsCommand() const