From 0472ee85ec25ca14a96d61fb051fa189674605a9 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 25 Jan 2021 11:56:09 +0100 Subject: Don't register invalid metatypes in QQmlMetaTypeData If the original type's ID is not valid, then QQmlMetaTypePrivate's ID is also not valid. Change-Id: Ia727e7dc99b1954b4c6fa9b599e8edc0ef9b3212 Reviewed-by: Fabian Kosmale --- src/qml/qml/qqmlmetatype.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 656a5c20eb..16aafac6d1 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -501,10 +501,7 @@ QQmlType QQmlMetaType::registerType(const QQmlPrivate::RegisterType &type) } QQmlTypePrivate *priv = createQQmlType(data, elementName, type); - addTypeToData(priv, data); - if (!type.typeId.isValid()) - data->idToType.insert(priv->typeId.id(), priv); return QQmlType(priv); } @@ -677,8 +674,6 @@ QQmlType QQmlMetaType::registerSequentialContainer( *priv->extraData.ld = container.metaSequence; addTypeToData(priv, data); - if (!container.typeId.isValid()) - data->idToType.insert(priv->typeId.id(), priv); return QQmlType(priv); } -- cgit v1.2.3