diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-15 17:27:25 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-20 11:54:51 +0000 |
| commit | 96dbcb09924239e7f7dc6547e29cb28003bbe5be (patch) | |
| tree | acc7a2b9df19e10385a62ec95e39140f792b9e9b /src/lib/corelib/buildgraph/depscanner.cpp | |
| parent | 9d025655d5524433ac8ffbbac0f5ab7aa196d797 (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/depscanner.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/depscanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp index 503355db1..7bc996a87 100644 --- a/src/lib/corelib/buildgraph/depscanner.cpp +++ b/src/lib/corelib/buildgraph/depscanner.cpp @@ -194,7 +194,7 @@ QStringList UserDependencyScanner::evaluate(Artifact *artifact, const ScriptFunc ctx->popScope(); m_engine->clearRequestedProperties(); if (Q_UNLIKELY(m_engine->hasErrorOrException(result))) { - QString msg = Tr::tr("evaluating scan script: ") + m_engine->uncaughtException().toString(); + QString msg = Tr::tr("evaluating scan script: ") + m_engine->lastErrorString(result); m_engine->clearExceptions(); throw ErrorInfo(msg, script->location); } |