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

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp

Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404

2 files changed, 50 insertions, 42 deletions

diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 6c9760e472..8ac7633ae0 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -1246,8 +1246,13 @@ UiObjectMember: T_DEFAULT T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlId
         sym(1).Node = node;
     } break;
 ./
+OptionalSemicolon: | Semicolon;
+/.
+/* we need OptionalSemicolon because UiScriptStatement might already parse the last semicolon
+  and then we would miss a semicolon (see tests/auto/quick/qquickvisualdatamodel/data/objectlist.qml)*/
+ ./
 
-UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement;
+UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement OptionalSemicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3), sym(5).Statement);
@@ -1259,7 +1264,7 @@ UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatemen
     } break;
 ./
 
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement OptionalSemicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4), sym(6).Statement);
@@ -1273,7 +1278,7 @@ UiObjectMember: T_READONLY T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScr
     } break;
 ./
 
-UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScriptStatement OptionalSemicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4), sym(6).Statement);
@@ -1287,7 +1292,7 @@ UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType QmlIdentifier T_COLON UiScri
     } break;
 ./
 
-UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET;
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET Semicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(4).UiQualifiedId->finish(), stringRef(6));
@@ -1313,7 +1318,7 @@ UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T
     } break;
 ./
 
-UiObjectMember: T_READONLY T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET;
+UiObjectMember: T_READONLY T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET Semicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(5).UiQualifiedId->finish(), stringRef(7));
@@ -1341,7 +1346,7 @@ UiObjectMember: T_READONLY T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT QmlI
     } break;
 ./
 
-UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON ExpressionStatementLookahead UiQualifiedId UiObjectInitializer;
+UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON ExpressionStatementLookahead UiQualifiedId UiObjectInitializer Semicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(2).UiQualifiedId->finish(), stringRef(3));
@@ -1364,7 +1369,7 @@ UiObjectMember: T_PROPERTY UiPropertyType QmlIdentifier T_COLON ExpressionStatem
     } break;
 ./
 
-UiObjectMember: T_READONLY T_PROPERTY UiPropertyType QmlIdentifier T_COLON ExpressionStatementLookahead UiQualifiedId UiObjectInitializer;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType QmlIdentifier T_COLON ExpressionStatementLookahead UiQualifiedId UiObjectInitializer Semicolon;
 /.
     case $rule_number: {
         AST::UiPublicMember *node = new (pool) AST::UiPublicMember(sym(3).UiQualifiedId->finish(), stringRef(4));
diff --git a/src/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp
index 700c191499..b63b2191b9 100644
--- a/src/qml/parser/qqmljsast.cpp
+++ b/src/qml/parser/qqmljsast.cpp
@@ -238,12 +238,11 @@ void StringLiteral::accept0(Visitor *visitor)
 
 void TemplateLiteral::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        if (next)
-            accept(next, visitor);
+    bool accepted = true;
+    for (TemplateLiteral *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        visitor->endVisit(it);
     }
-
-    visitor->endVisit(this);
 }
 
 void NumericLiteral::accept0(Visitor *visitor)
@@ -1015,13 +1014,13 @@ BoundNames FormalParameterList::boundNames() const
 
 void FormalParameterList::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        accept(element, visitor);
-        if (next)
-            accept(next, visitor);
+    bool accepted = true;
+    for (FormalParameterList *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        if (accepted)
+            accept(it->element, visitor);
+        visitor->endVisit(it);
     }
-
-    visitor->endVisit(this);
 }
 
 FormalParameterList *FormalParameterList::finish(QQmlJS::MemoryPool *pool)
@@ -1321,12 +1320,14 @@ void UiPragma::accept0(Visitor *visitor)
 
 void UiHeaderItemList::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        accept(headerItem, visitor);
-        accept(next, visitor);
-    }
+    bool accepted = true;
+    for (UiHeaderItemList *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        if (accepted)
+            accept(it->headerItem, visitor);
 
-    visitor->endVisit(this);
+        visitor->endVisit(it);
+    }
 }
 
 
@@ -1391,14 +1392,15 @@ void PatternElement::boundNames(BoundNames *names)
 
 void PatternElementList::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        accept(elision, visitor);
-        accept(element, visitor);
-        if (next)
-            accept(next, visitor);
+    bool accepted = true;
+    for (PatternElementList *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        if (accepted) {
+            accept(it->elision, visitor);
+            accept(it->element, visitor);
+        }
+        visitor->endVisit(it);
     }
-
-    visitor->endVisit(this);
 }
 
 void PatternElementList::boundNames(BoundNames *names)
@@ -1428,13 +1430,13 @@ void PatternProperty::boundNames(BoundNames *names)
 
 void PatternPropertyList::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        accept(property, visitor);
-        if (next)
-            accept(next, visitor);
+    bool accepted = true;
+    for (PatternPropertyList *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        if (accepted)
+            accept(it->property, visitor);
+        visitor->endVisit(it);
     }
-
-    visitor->endVisit(this);
 }
 
 void PatternPropertyList::boundNames(BoundNames *names)
@@ -1479,13 +1481,14 @@ void ClassDeclaration::accept0(Visitor *visitor)
 
 void ClassElementList::accept0(Visitor *visitor)
 {
-    if (visitor->visit(this)) {
-        accept(property, visitor);
-        if (next)
-            accept(next, visitor);
-    }
+    bool accepted = true;
+    for (ClassElementList *it = this; it && accepted; it = it->next) {
+        accepted = visitor->visit(it);
+        if (accepted)
+            accept(it->property, visitor);
 
-    visitor->endVisit(this);
+        visitor->endVisit(it);
+    }
 }
 
 ClassElementList *ClassElementList::finish()