Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: Ifc24fbd99ee216e528a213fdbfd2892b3df419fe

2 files changed, 15 insertions, 16 deletions

diff --git a/src/qml/jsruntime/qv4runtimecodegen.cpp b/src/qml/jsruntime/qv4runtimecodegen.cpp
index 99d0de5ec6..8d324acbd0 100644
--- a/src/qml/jsruntime/qv4runtimecodegen.cpp
+++ b/src/qml/jsruntime/qv4runtimecodegen.cpp
@@ -59,7 +59,7 @@ void RuntimeCodegen::generateFromFunctionExpression(const QString &fileName,
     scan(ast);
     scan.leaveEnvironment();
 
-    if (hasError)
+    if (hasError())
         return;
 
     int index = defineFunction(ast->name.toString(), ast, ast->formals, ast->body);
@@ -68,17 +68,19 @@ void RuntimeCodegen::generateFromFunctionExpression(const QString &fileName,
 
 void RuntimeCodegen::throwSyntaxError(const AST::SourceLocation &loc, const QString &detail)
 {
-    if (hasError)
+    if (hasError())
         return;
-    hasError = true;
+
+    Codegen::throwSyntaxError(loc, detail);
     engine->throwSyntaxError(detail, _module->fileName, loc.startLine, loc.startColumn);
 }
 
 void RuntimeCodegen::throwReferenceError(const AST::SourceLocation &loc, const QString &detail)
 {
-    if (hasError)
+    if (hasError())
         return;
-    hasError = true;
+
+    Codegen::throwReferenceError(loc, detail);
     engine->throwReferenceError(detail, _module->fileName, loc.startLine, loc.startColumn);
 }
 
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 4dc5030fb0..c463812590 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -203,18 +203,15 @@ QV4::CompiledData::CompilationUnit Script::precompile(
 
     Codegen cg(unitGenerator, /*strict mode*/false);
     cg.generateFromProgram(fileName, finalUrl, source, program, module, contextType);
-    const auto v4Errors = cg.errors();
-    if (!v4Errors.isEmpty()) {
-        const QUrl url = cg.url();
+    if (cg.hasError()) {
         if (reportedErrors) {
-            for (const auto &v4Error : v4Errors) {
-                QQmlError error;
-                error.setUrl(url);
-                error.setLine(v4Error.line);
-                error.setColumn(v4Error.column);
-                error.setDescription(v4Error.message);
-                reportedErrors->append(error);
-            }
+            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;
     }