Allow overriding type registrations

Previously if the same revision of the same type was registered multiple
times, the first registration would dominate. Now, the last one does.

[ChangeLog] If you register the same revision of the same type multiple
times, the last registration is the one QML will use. This allows you to
override qmlRegisterSingleton*() calls, for example in order to register
a singleton instance for a type tagged with QML_SINGLETON.

Task-number: QTBUG-79331
Change-Id: I32a2acabc89af6faa89d8ccb6380a473bc8b8ddd
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp
index 9c9bf3e48f..9d6f269030 100644
--- a/src/qml/qml/qqmltypemodule.cpp
+++ b/src/qml/qml/qqmltypemodule.cpp
@@ -97,10 +97,14 @@ void QQmlTypeModule::add(QQmlTypePrivate *type)
 
     QList<QQmlTypePrivate *> &list = d->typeHash[type->elementName];
     for (int ii = 0; ii < list.count(); ++ii) {
-        Q_ASSERT(list.at(ii));
-        if (list.at(ii)->version_min < type->version_min) {
+        QQmlTypePrivate *in_list = list.at(ii);
+        Q_ASSERT(in_list);
+        if (in_list->version_min < type->version_min) {
             list.insert(ii, type);
             return;
+        } else if (in_list->version_min == type->version_min) {
+            list[ii] = type;
+            return;
         }
     }
     list.append(type);