diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-10 19:20:21 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-12 11:36:25 +0100 |
| commit | 25f765cbd9067c1ebb61721efbe471d9100d9237 (patch) | |
| tree | dff3b8ed6cdfefca12b1ef6d9759d91ad040e018 /src/qml/qml/qqmlpropertycachecreator.cpp | |
| parent | 953ea29328db71ac7a8ef177ecbc2329367b9170 (diff) | |
Unregister value types when tearing down QML types
Move the value type registry into QQmlMetaTypeData. This way we can
conveniently drop the relevant entries when unregistering a type.
Fixes: QTBUG-86946
Change-Id: Id024a34a8b2b622fd9417fc0e52864b43c66cc01
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlpropertycachecreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycachecreator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp index 141aa80f85..5b44bd4f9d 100644 --- a/src/qml/qml/qqmlpropertycachecreator.cpp +++ b/src/qml/qml/qqmlpropertycachecreator.cpp @@ -132,7 +132,7 @@ QQmlRefPointer<QQmlPropertyCache> QQmlBindingInstantiationContext::instantiating // There is another overload that takes no version, which we shall not use here. return enginePrivate->rawPropertyCacheForType(instantiatingProperty->propType().id(), instantiatingProperty->typeVersion()); - } else if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(instantiatingProperty->propType())) { + } else if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(instantiatingProperty->propType())) { return enginePrivate->cache(vtmo, instantiatingProperty->typeVersion()); } } |