diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-12 17:03:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-13 08:51:52 +0200 |
| commit | ebc31ca3c4a6a49c274f82af52a2e1b6cace30b7 (patch) | |
| tree | 5e80ad3dacc2aad47289d577994a58e875dce3d7 /tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | |
| parent | b8f92eef13b30a6ddf3a6e5dbf1a89b5e24cfdc7 (diff) | |
Fix syntax error propagation
For syntax errors we use the DiagnosticMessage type in qv4context.cpp,
that contains detailed information about the error. We must catch that
error correctly in QQmlVME::run and report it to the engine.
Change-Id: I8f53c7db8dbdc6afa72396f3c25537690a6f5841
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 3076c7a478..cfbd987f94 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -3928,7 +3928,7 @@ void tst_qqmlecmascript::importScripts_data() QTest::newRow("malformed import statement") << testFileUrl("jsimportfail/malformedImport.qml") << QString() - << (QStringList() << testFileUrl("jsimportfail/malformedImport.js").toString() + QLatin1String(":1: SyntaxError: Unexpected token .")) + << (QStringList() << testFileUrl("jsimportfail/malformedImport.js").toString() + QLatin1String(":1:1: Syntax error")) << QStringList() << QVariantList(); |