1 files changed, 34 insertions, 17 deletions

diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 2225191a9d..d83fc4bb48 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -65,11 +65,13 @@ struct QQmlValueTypeFactoryImpl
     QQmlValueType *valueTypes[QVariant::UserType];
     QHash<int, QQmlValueType *> userTypes;
     QMutex mutex;
+
+    QQmlValueType invalidValueType;
 };
 
 QQmlValueTypeFactoryImpl::QQmlValueTypeFactoryImpl()
 {
-    std::fill_n(valueTypes, int(QVariant::UserType), nullptr);
+    std::fill_n(valueTypes, int(QVariant::UserType), &invalidValueType);
 
 #if QT_CONFIG(qml_itemmodel)
     // See types wrapped in qqmlmodelindexvaluetype_p.h
@@ -79,20 +81,18 @@ QQmlValueTypeFactoryImpl::QQmlValueTypeFactoryImpl()
 
 QQmlValueTypeFactoryImpl::~QQmlValueTypeFactoryImpl()
 {
-    qDeleteAll(valueTypes, valueTypes + QVariant::UserType);
+    for (QQmlValueType *type : valueTypes) {
+        if (type != &invalidValueType)
+            delete type;
+    }
     qDeleteAll(userTypes);
 }
 
-bool QQmlValueTypeFactoryImpl::isValueType(int idx)
+bool isInternalType(int idx)
 {
-    if (idx >= QMetaType::User)
-        return valueType(idx) != nullptr;
-
-    if (idx < 0)
-        return false;
-
     // Qt internal types
     switch (idx) {
+    case QMetaType::UnknownType:
     case QMetaType::QStringList:
     case QMetaType::QObjectStar:
     case QMetaType::VoidStar:
@@ -101,12 +101,20 @@ bool QQmlValueTypeFactoryImpl::isValueType(int idx)
     case QMetaType::QLocale:
     case QMetaType::QImage:  // scarce type, keep as QVariant
     case QMetaType::QPixmap: // scarce type, keep as QVariant
-        return false;
-    default:
         return true;
+    default:
+        return false;
     }
 }
 
+bool QQmlValueTypeFactoryImpl::isValueType(int idx)
+{
+    if (idx < 0 || isInternalType(idx))
+        return false;
+
+    return valueType(idx) != nullptr;
+}
+
 const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t)
 {
     switch (t) {
@@ -168,15 +176,17 @@ QQmlValueType *QQmlValueTypeFactoryImpl::valueType(int idx)
     }
 
     QQmlValueType *rv = valueTypes[idx];
-    if (!rv) {
+    if (rv == &invalidValueType) {
         // No need for mutex protection - the most we can lose is a valueType instance
 
         // TODO: Investigate the performance/memory characteristics of
         // removing the preallocated array
-        if (const QMetaObject *mo = metaObjectForMetaType(idx)) {
-            rv = new QQmlValueType(idx, mo);
-            valueTypes[idx] = rv;
-        }
+        if (isInternalType(idx))
+            rv = valueTypes[idx] = nullptr;
+        else if (const QMetaObject *mo = metaObjectForMetaType(idx))
+            rv = valueTypes[idx] = new QQmlValueType(idx, mo);
+        else
+            rv = valueTypes[idx] = nullptr;
     }
 
     return rv;
@@ -208,6 +218,13 @@ void QQmlValueTypeFactory::registerValueTypes(const char *uri, int versionMajor,
 #endif
 }
 
+QQmlValueType::QQmlValueType() :
+    _metaObject(nullptr),
+    gadgetPtr(nullptr),
+    metaType(QMetaType::UnknownType)
+{
+}
+
 QQmlValueType::QQmlValueType(int typeId, const QMetaObject *gadgetMetaObject)
     : gadgetPtr(QMetaType::create(typeId))
     , metaType(typeId)
@@ -225,7 +242,7 @@ QQmlValueType::QQmlValueType(int typeId, const QMetaObject *gadgetMetaObject)
 QQmlValueType::~QQmlValueType()
 {
     QObjectPrivate *op = QObjectPrivate::get(this);
-    Q_ASSERT(op->metaObject == this);
+    Q_ASSERT(op->metaObject == nullptr || op->metaObject == this);
     op->metaObject = nullptr;
     ::free(const_cast<QMetaObject *>(_metaObject));
     metaType.destroy(gadgetPtr);