Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensource

Qt 6.2.11-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I088fe99748b323fbdf49c3766c262eb2a05131d9

1 files changed, 22 insertions, 7 deletions

diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index 8b2d5066c6..9453120eb6 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -1322,6 +1322,28 @@ struct TypeReferenceMap : QHash<int, TypeReference>
         return *insert(nameIndex, loc);
     }
 
+    template <typename Iterator>
+    void collectFromFunctions(Iterator it, Iterator end)
+    {
+        for (; it != end; ++it) {
+            auto formal = it->formalsBegin();
+            auto formalEnd = it->formalsEnd();
+            for ( ; formal != formalEnd; ++formal) {
+                if (!formal->type.indexIsBuiltinType()) {
+                    TypeReference &r
+                            = this->add(formal->type.typeNameIndexOrBuiltinType(), it->location);
+                    r.errorWhenNotFound = true;
+                }
+            }
+
+            if (!it->returnType.indexIsBuiltinType()) {
+                TypeReference &r
+                    = this->add(it->returnType.typeNameIndexOrBuiltinType(), it->location);
+                r.errorWhenNotFound = true;
+            }
+        }
+    }
+
     template <typename CompiledObject>
     void collectFromObject(const CompiledObject *obj)
     {
@@ -1353,13 +1375,6 @@ struct TypeReferenceMap : QHash<int, TypeReference>
             this->add(ic->nameIndex, ic->location);
         }
     }
-
-    template <typename Iterator>
-    void collectFromObjects(Iterator it, Iterator end)
-    {
-        for (; it != end; ++it)
-            collectFromObject(*it);
-    }
 };
 
 using DependentTypesHasher = std::function<QByteArray()>;