diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-02 20:38:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 14:38:27 +0100 |
| commit | 59eaf59103c2cc78ddd9972f410ef1ea43077e22 (patch) | |
| tree | 557a5d4d5e7f08deb89169605e91b06754e2b951 /src/qml/compiler/qqmltypecompiler.cpp | |
| parent | 5a280b9a2b472391e4cf853fb40042b892667c58 (diff) | |
[new compiler] Propagate JS code gen errors
Change-Id: I3b99f3fc762df7ac820b26597bf809a80849b5ce
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 09a1c30bd8..41dcd669a3 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -190,6 +190,11 @@ bool QQmlTypeCompiler::compile() JSCodeGen jsCodeGen(typeData->finalUrlString(), parsedQML->code, &parsedQML->jsModule, &parsedQML->jsParserEngine, parsedQML->program, compiledData->importCache); const QVector<int> runtimeFunctionIndices = jsCodeGen.generateJSCodeForFunctionsAndBindings(parsedQML->functions); + QList<QQmlError> jsErrors = jsCodeGen.errors(); + if (!jsErrors.isEmpty()) { + errors << jsErrors; + return false; + } QV4::ExecutionEngine *v4 = engine->v4engine(); |