1 files changed, 24 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index a9464c9759..5836c85666 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -235,7 +235,7 @@ public:
 
     struct PropertyCacheByMinorVersion
     {
-        PropertyCacheByMinorVersion() : cache(Q_NULLPTR), minorVersion(-1) {}
+        PropertyCacheByMinorVersion() : cache(nullptr), minorVersion(-1) {}
         explicit PropertyCacheByMinorVersion(QQmlPropertyCache *pc, int ver) : cache(pc), minorVersion(ver) {}
         QQmlPropertyCachePtr cache;
         int minorVersion;
@@ -837,7 +837,7 @@ QQmlPropertyCache *QQmlTypePrivate::propertyCacheForMinorVersion(int minorVersio
     for (int i = 0; i < propertyCaches.count(); ++i)
         if (propertyCaches.at(i).minorVersion == minorVersion)
             return propertyCaches.at(i).cache;
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void QQmlTypePrivate::setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache)
@@ -1303,6 +1303,13 @@ void QQmlType::derefHandle(QQmlTypePrivate *priv)
         delete priv;
 }
 
+int QQmlType::refCount(QQmlTypePrivate *priv)
+{
+    if (priv)
+        return priv->refCount;
+    return -1;
+}
+
 namespace {
 template <typename QQmlTypeContainer>
 void removeQQmlTypePrivate(QQmlTypeContainer &container, const QQmlTypePrivate *reference)
@@ -1374,7 +1381,7 @@ void QQmlTypeModulePrivate::add(QQmlTypePrivate *type)
 void QQmlTypeModulePrivate::remove(const QQmlTypePrivate *type)
 {
     for (TypeHash::ConstIterator elementIt = typeHash.begin(); elementIt != typeHash.end();) {
-        QList<QQmlTypePrivate *> &list = typeHash[elementIt.key()];
+        QList<QQmlTypePrivate *> &list = const_cast<QList<QQmlTypePrivate *> &>(elementIt.value());
 
         removeQQmlTypePrivate(list, type);
 
@@ -1417,6 +1424,18 @@ QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const
     return QQmlType();
 }
 
+void QQmlTypeModule::walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const
+{
+    QMutexLocker lock(metaTypeDataLock());
+    for (auto typeCandidates = d->typeHash.begin(), end = d->typeHash.end();
+         typeCandidates != end; ++typeCandidates) {
+        for (auto type: typeCandidates.value()) {
+            if (type->regType == QQmlType::CompositeSingletonType)
+                callback(QQmlType(type));
+        }
+    }
+}
+
 QQmlTypeModuleVersion::QQmlTypeModuleVersion()
 : m_module(0), m_minor(0)
 {
@@ -1481,6 +1500,7 @@ void qmlClearTypeRegistrations() // Declared in qqml.h
     data->urlToNonFileImportType.clear();
     data->metaObjectToType.clear();
     data->uriToModule.clear();
+    data->undeletableTypes.clear();
 
     QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types
 #if QT_CONFIG(library)
@@ -2419,7 +2439,7 @@ void QQmlMetaType::freeUnusedTypesAndCaches()
             while (it != data->propertyCaches.end()) {
 
                 if ((*it)->count() == 1) {
-                    QQmlPropertyCache *pc = Q_NULLPTR;
+                    QQmlPropertyCache *pc = nullptr;
                     qSwap(pc, *it);
                     it = data->propertyCaches.erase(it);
                     pc->release();