Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Icf36857844b6643d9fbe3c841b1d9b78943435d4

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 83196f4577..29b19b433f 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -2568,7 +2568,8 @@ void qmlUnregisterType(int typeIndex)
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
     {
-        const QQmlTypePrivate *d = data->types.value(typeIndex).priv();
+        const QQmlType type = data->types.value(typeIndex);
+        const QQmlTypePrivate *d = type.priv();
         if (d) {
             removeQQmlTypePrivate(data->idToType, d);
             removeQQmlTypePrivate(data->nameToType, d);
@@ -2580,6 +2581,7 @@ void qmlUnregisterType(int typeIndex)
                  modulePrivate->remove(d);
             }
             data->types[typeIndex] = QQmlType();
+            data->undeletableTypes.remove(type);
         }
     }
 }