aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/processcommandexecutor.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-15 17:27:25 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-07-20 11:54:51 +0000
commit96dbcb09924239e7f7dc6547e29cb28003bbe5be (patch)
treeacc7a2b9df19e10385a62ec95e39140f792b9e9b /src/lib/corelib/buildgraph/processcommandexecutor.cpp
parent9d025655d5524433ac8ffbbac0f5ab7aa196d797 (diff)
Always show the correct error string from the script engine.
Meaning that we check whether the value is an error or the engine has an uncaught exception, and print the respective string. Change-Id: Ie2912e28a82906c7ee9323e2f0e55c6b3de96872 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/processcommandexecutor.cpp')
-rw-r--r--src/lib/corelib/buildgraph/processcommandexecutor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index b40e83649..87ac1c920 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -188,7 +188,7 @@ QString ProcessCommandExecutor::filterProcessOutput(const QByteArray &_output,
QScriptValue filteredOutput = filterFunction.call(scriptEngine()->undefinedValue(), outputArg);
if (scriptEngine()->hasErrorOrException(filteredOutput)) {
logger().printWarning(ErrorInfo(Tr::tr("Error when calling output filter function: %1")
- .arg(filteredOutput.toString())));
+ .arg(scriptEngine()->lastErrorString(filteredOutput))));
return output;
}