1 files changed, 12 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index ee7f4dff0b..c463812590 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -108,10 +108,10 @@ void Script::parse()
     const auto diagnosticMessages = parser.diagnosticMessages();
     for (const DiagnosticMessage &m : diagnosticMessages) {
         if (m.isError()) {
-            valueScope.engine->throwSyntaxError(m.message, sourceFile, m.loc.startLine, m.loc.startColumn);
+            valueScope.engine->throwSyntaxError(m.message, sourceFile, m.line, m.column);
             return;
         } else {
-            qWarning() << sourceFile << ':' << m.loc.startLine << ':' << m.loc.startColumn
+            qWarning() << sourceFile << ':' << m.line << ':' << m.column
                       << ": warning: " << m.message;
         }
     }
@@ -203,10 +203,16 @@ QV4::CompiledData::CompilationUnit Script::precompile(
 
     Codegen cg(unitGenerator, /*strict mode*/false);
     cg.generateFromProgram(fileName, finalUrl, source, program, module, contextType);
-    errors = cg.qmlErrors();
-    if (!errors.isEmpty()) {
-        if (reportedErrors)
-            *reportedErrors << errors;
+    if (cg.hasError()) {
+        if (reportedErrors) {
+            const auto v4Error = cg.error();
+            QQmlError error;
+            error.setUrl(cg.url());
+            error.setLine(v4Error.line);
+            error.setColumn(v4Error.column);
+            error.setDescription(v4Error.message);
+            reportedErrors->append(error);
+        }
         return nullptr;
     }