1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
index 5239b635ce..e51d4ca1a4 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -71,7 +71,7 @@ struct QQmlMetaTypeData
     QSet<QQmlType> undeletableTypes;
     typedef QHash<int, QQmlTypePrivate *> Ids;
     Ids idToType;
-    typedef QHash<QHashedStringRef, QQmlTypePrivate *> Names;
+    typedef QMultiHash<QHashedStringRef, QQmlTypePrivate *> Names;
     Names nameToType;
     typedef QHash<QUrl, QQmlTypePrivate *> Files; //For file imported composite types only
     Files urlToType;
@@ -79,7 +79,7 @@ struct QQmlMetaTypeData
             // singleton types. This way we can locate any
             // of them by url, even if it was registered as
             // a module via QQmlPrivate::RegisterCompositeType
-    typedef QHash<const QMetaObject *, QQmlTypePrivate *> MetaObjects;
+    typedef QMultiHash<const QMetaObject *, QQmlTypePrivate *> MetaObjects;
     MetaObjects metaObjectToType;
     typedef QHash<int, QQmlMetaType::StringConverter> StringConverters;
     StringConverters stringConverters;
@@ -96,9 +96,13 @@ struct QQmlMetaTypeData
         QHashedString uri;
         int majorVersion;
     };
+
     typedef QHash<VersionedUri, QQmlTypeModule *> TypeModules;
     TypeModules uriToModule;
 
+    QHash<VersionedUri, void (*)()> moduleTypeRegistrationFunctions;
+    bool registerModuleTypes(const VersionedUri &versionedUri);
+
     QBitArray objects;
     QBitArray interfaces;
     QBitArray lists;
@@ -106,10 +110,6 @@ struct QQmlMetaTypeData
     QList<QQmlPrivate::AutoParentFunction> parentFunctions;
     QVector<QQmlPrivate::QmlUnitCacheLookupFunction> lookupCachedQmlUnit;
 
-    QSet<QString> protectedNamespaces;
-
-    QString typeRegistrationNamespace;
-
     QHash<int, int> qmlLists;
 
     QHash<const QMetaObject *, QQmlPropertyCache *> propertyCaches;