diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-25 11:56:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-25 15:58:44 +0100 |
| commit | 0472ee85ec25ca14a96d61fb051fa189674605a9 (patch) | |
| tree | bb4ca852f5e2dec843babb27b79c51910f337ba9 /src | |
| parent | 5006de6166c11568696495b92cdbc2cf4dd6f695 (diff) | |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 5 |
1 files changed, 0 insertions, 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); } |