Always search for instantiating property cache by QQmlType

When given an invalid type revision rawPropertyCacheForType() assumes we
want to search by metaObject. However, in the case of
instantiatingPropertyCache we always want to search by QQmlType, and we
want the invalid type revision to be interpreted as "any version".

Change-Id: I79d0a137e4b2e7e2d6063c47afae55d3302e67d6
Fixes: QTBUG-81967
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp
index c85c44eab7..5e83deff18 100644
--- a/src/qml/qml/qqmlpropertycachecreator.cpp
+++ b/src/qml/qml/qqmlpropertycachecreator.cpp
@@ -119,9 +119,13 @@ 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());
+                        instantiatingProperty->typeVersion().isValid()
+                            ? instantiatingProperty->typeVersion()
+                            : QTypeRevision::fromVersion(254, 254));
         } else if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(instantiatingProperty->propType())) {
             return enginePrivate->cache(vtmo, instantiatingProperty->typeVersion());
         }