Process major versions as part of Q_REVISION

Retrieve the major version from the meta object revisions and use them
to register types and generate qmltypes files.

Change-Id: I35da8963457660d1a49ba9063574e1a68057a7ba
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp
index 5e83deff18..f132fb2d78 100644
--- a/src/qml/qml/qqmlpropertycachecreator.cpp
+++ b/src/qml/qml/qqmlpropertycachecreator.cpp
@@ -119,13 +119,10 @@ QQmlRefPointer<QQmlPropertyCache> QQmlBindingInstantiationContext::instantiating
 {
     if (instantiatingProperty) {
         if (instantiatingProperty->isQObject()) {
-            // If the typeVersion is invalid here, we want to match any version we can find.
-            // 254.254 is the largest version QTypeRevision can hold.
-            return enginePrivate->rawPropertyCacheForType(
-                        instantiatingProperty->propType(),
-                        instantiatingProperty->typeVersion().isValid()
-                            ? instantiatingProperty->typeVersion()
-                            : QTypeRevision::fromVersion(254, 254));
+            // rawPropertyCacheForType assumes a given unspecified version means "any version".
+            // There is another overload that takes no version, which we shall not use here.
+            return enginePrivate->rawPropertyCacheForType(instantiatingProperty->propType(),
+                                                          instantiatingProperty->typeVersion());
         } else if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(instantiatingProperty->propType())) {
             return enginePrivate->cache(vtmo, instantiatingProperty->typeVersion());
         }