diff options
| author | Frederik Gladhorn <[email protected]> | 2014-05-01 12:44:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <[email protected]> | 2014-05-01 12:44:51 +0200 |
| commit | b78372c4ba31da2d941d70ba23a927deae7d830c (patch) | |
| tree | 25d9eeefbbb4c6ace084c56e58ac7bd1927217b5 /src/qml/jsruntime/qv4script.cpp | |
| parent | 9990c0f577f6a6a67ccebffb56ad1afc7a98ed1d (diff) | |
| parent | 7ea1f75fd877f312d70a90ab0405f3ca03914171 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I996a85744753598bb48c7e0d7954049202f4f037
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 33922684da..36f61a1df5 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -385,10 +385,10 @@ QV4::CompiledData::CompilationUnit *Script::precompile(IR::Module *module, Compi QQmlJS::Codegen cg(/*strict mode*/false); cg.generateFromProgram(url.toString(), source, program, module, QQmlJS::Codegen::EvalCode); - errors = cg.errors(); + errors = cg.qmlErrors(); if (!errors.isEmpty()) { if (reportedErrors) - *reportedErrors << cg.errors(); + *reportedErrors << errors; return 0; } |