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/jsruntime/qv4engine.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/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 320dc15a15..7ae281fb1a 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -1808,7 +1808,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant) break; } - if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(metaType)) + if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(metaType)) return QV4::QQmlValueTypeWrapper::create(this, variant, vtmo, metaType); } else { QV4::Scope scope(this); @@ -1855,7 +1855,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant) return sequentialIterableToJS(this, lst); } - if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(metaType)) + if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(metaType)) return QV4::QQmlValueTypeWrapper::create(this, variant, vtmo, metaType); } |