1 files changed, 15 insertions, 17 deletions
diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
index e51d4ca1a4..322ead084a 100644
--- a/src/qml/qml/qqmlmetatypedata_p.h
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -57,7 +57,6 @@
 
 #include <QtCore/qset.h>
 #include <QtCore/qvector.h>
-#include <QtCore/qbitarray.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -83,29 +82,28 @@ struct QQmlMetaTypeData
     MetaObjects metaObjectToType;
     typedef QHash<int, QQmlMetaType::StringConverter> StringConverters;
     StringConverters stringConverters;
-    QVector<QHash<int, QQmlRefPointer<QQmlPropertyCache>>> typePropertyCaches;
+    QVector<QHash<QTypeRevision, QQmlRefPointer<QQmlPropertyCache>>> typePropertyCaches;
 
     struct VersionedUri {
-        VersionedUri()
-            : majorVersion(0) {}
-        VersionedUri(const QHashedString &uri, int majorVersion)
-            : uri(uri), majorVersion(majorVersion) {}
+        VersionedUri() : majorVersion(0) {}
+        VersionedUri(const QHashedString &uri, QTypeRevision version)
+            : uri(uri), majorVersion(version.majorVersion()) {}
         bool operator==(const VersionedUri &other) const {
             return other.majorVersion == majorVersion && other.uri == uri;
         }
         QHashedString uri;
-        int majorVersion;
+        quint8 majorVersion;
     };
 
     typedef QHash<VersionedUri, QQmlTypeModule *> TypeModules;
     TypeModules uriToModule;
 
-    QHash<VersionedUri, void (*)()> moduleTypeRegistrationFunctions;
-    bool registerModuleTypes(const VersionedUri &versionedUri);
+    QHash<QString, void (*)()> moduleTypeRegistrationFunctions;
+    bool registerModuleTypes(const QString &uri);
 
-    QBitArray objects;
-    QBitArray interfaces;
-    QBitArray lists;
+    QSet<int> interfaces;
+    QSet<int> objects;
+    QSet<int> lists;
 
     QList<QQmlPrivate::AutoParentFunction> parentFunctions;
     QVector<QQmlPrivate::QmlUnitCacheLookupFunction> lookupCachedQmlUnit;
@@ -114,12 +112,12 @@ struct QQmlMetaTypeData
 
     QHash<const QMetaObject *, QQmlPropertyCache *> propertyCaches;
 
-    QQmlPropertyCache *propertyCacheForMinorVersion(int index, int minorVersion) const;
-    void setPropertyCacheForMinorVersion(int index, int minorVersion, QQmlPropertyCache *cache);
-    void clearPropertyCachesForMinorVersion(int index);
+    QQmlPropertyCache *propertyCacheForVersion(int index, QTypeRevision version) const;
+    void setPropertyCacheForVersion(int index, QTypeRevision version, QQmlPropertyCache *cache);
+    void clearPropertyCachesForVersion(int index);
 
-    QQmlPropertyCache *propertyCache(const QMetaObject *metaObject, int minorVersion);
-    QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion);
+    QQmlPropertyCache *propertyCache(const QMetaObject *metaObject, QTypeRevision version);
+    QQmlPropertyCache *propertyCache(const QQmlType &type, QTypeRevision version);
 
     void setTypeRegistrationFailures(QStringList *failures)
     {