QML: Split qqmlmetatype{_p.h|.cpp} into multiple files

Having all those classes in one big file promotes spaghetti code and
makes the code unreadable.

Change-Id: I3b6df93b9cfe1d97228771049b3054e78b868ea3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

23 files changed, 2744 insertions, 1928 deletions

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index eaa21c97ae..9c3d4e6e26 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -1,4 +1,5 @@
 SOURCES += \
+    $$PWD/qqml.cpp \
     $$PWD/qqmlopenmetaobject.cpp \
     $$PWD/qqmlvmemetaobject.cpp \
     $$PWD/qqmlengine.cpp \
@@ -14,7 +15,12 @@ SOURCES += \
     $$PWD/qqmlvme.cpp \
     $$PWD/qqmlboundsignal.cpp \
     $$PWD/qqmlmetatype.cpp \
+    $$PWD/qqmlmetatyperegistrationfailurerecorder.cpp \
+    $$PWD/qqmlmetatypedata.cpp \
     $$PWD/qqmlstringconverters.cpp \
+    $$PWD/qqmltype.cpp \
+    $$PWD/qqmltypemodule.cpp \
+    $$PWD/qqmltypemoduleversion.cpp \
     $$PWD/qqmlparserstatus.cpp \
     $$PWD/qqmltypeloader.cpp \
     $$PWD/qqmlinfo.cpp \
@@ -71,6 +77,13 @@ HEADERS += \
     $$PWD/qqmlexpression_p.h \
     $$PWD/qqmlprivate.h \
     $$PWD/qqmlmetatype_p.h \
+    $$PWD/qqmlmetatypedata_p.h \
+    $$PWD/qqmlmetatyperegistrationfailurerecorder_p.h \
+    $$PWD/qqmltype_p.h \
+    $$PWD/qqmltype_p_p.h \
+    $$PWD/qqmltypemodule_p.h \
+    $$PWD/qqmltypemodule_p_p.h \
+    $$PWD/qqmltypemoduleversion_p.h \
     $$PWD/qqmlengine.h \
     $$PWD/qqmlcontext.h \
     $$PWD/qqmlexpression.h \
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp
new file mode 100644
index 0000000000..c1a8ed2a3d
--- /dev/null
+++ b/src/qml/qml/qqml.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqml.h"
+
+#include <QtQml/qqmlprivate.h>
+
+#include <private/qqmlengine_p.h>
+#include <private/qqmlmetatype_p.h>
+#include <private/qqmlmetatypedata_p.h>
+#include <private/qqmltype_p_p.h>
+#include <private/qqmltypemodule_p_p.h>
+
+#include <QtCore/qmutex.h>
+
+QT_BEGIN_NAMESPACE
+
+void qmlClearTypeRegistrations() // Declared in qqml.h
+{
+    QQmlMetaType::clearTypeRegistrations();
+    QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types
+#if QT_CONFIG(library)
+    qmlClearEnginePlugins();
+#endif
+}
+
+//From qqml.h
+bool qmlProtectModule(const char *uri, int majVersion)
+{
+    return QQmlMetaType::protectModule(uri, majVersion);
+}
+
+//From qqml.h
+void qmlRegisterModule(const char *uri, int versionMajor, int versionMinor)
+{
+    QQmlMetaType::registerModule(uri, versionMajor, versionMinor);
+}
+
+//From qqml.h
+int qmlTypeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+{
+    return QQmlMetaType::typeId(uri, versionMajor, versionMinor, qmlName);
+}
+
+/*
+This method is "over generalized" to allow us to (potentially) register more types of things in
+the future without adding exported symbols.
+*/
+int QQmlPrivate::qmlregister(RegistrationType type, void *data)
+{
+    if (type == AutoParentRegistration) {
+        return QQmlMetaType::registerAutoParentFunction(
+                *reinterpret_cast<RegisterAutoParent *>(data));
+    } else if (type == QmlUnitCacheHookRegistration) {
+        return QQmlMetaType::registerUnitCacheHook(
+                *reinterpret_cast<RegisterQmlUnitCacheHook *>(data));
+    }
+
+    QQmlType dtype;
+    if (type == TypeRegistration)
+        dtype = QQmlMetaType::registerType(*reinterpret_cast<RegisterType *>(data));
+    else if (type == InterfaceRegistration)
+        dtype = QQmlMetaType::registerInterface(*reinterpret_cast<RegisterInterface *>(data));
+    else if (type == SingletonRegistration)
+        dtype = QQmlMetaType::registerSingletonType(*reinterpret_cast<RegisterSingletonType *>(data));
+    else if (type == CompositeRegistration)
+        dtype = QQmlMetaType::registerCompositeType(*reinterpret_cast<RegisterCompositeType *>(data));
+    else if (type == CompositeSingletonRegistration)
+        dtype = QQmlMetaType::registerCompositeSingletonType(*reinterpret_cast<RegisterCompositeSingletonType *>(data));
+    else
+        return -1;
+
+    if (!dtype.isValid())
+        return -1;
+
+    QQmlMetaType::registerUndeletableType(dtype);
+    return dtype.index();
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index e5b78591e0..cf6f831818 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -44,7 +44,6 @@
 #include "qqmlengine_p.h"
 #include "qqmlexpression_p.h"
 #include "qqmlcontext_p.h"
-#include "qqmlmetatype_p.h"
 #include "qqml.h"
 #include "qqmlcontext.h"
 #include "qqmlglobal_p.h"
diff --git a/src/qml/qml/qqmlcustomparser_p.h b/src/qml/qml/qqmlcustomparser_p.h
index bf28bca447..aa933553a8 100644
--- a/src/qml/qml/qqmlcustomparser_p.h
+++ b/src/qml/qml/qqmlcustomparser_p.h
@@ -51,7 +51,6 @@
 // We mean it.
 //
 
-#include "qqmlmetatype_p.h"
 #include "qqmlerror.h"
 #include "qqmlbinding_p.h"
 #include <private/qqmltypecompiler_p.h>
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index e379d416fd..2189a49d16 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -54,6 +54,8 @@
 #include <private/qqmltypenamecache_p.h>
 #include <private/qqmlengine_p.h>
 #include <private/qfieldlist_p.h>
+#include <private/qqmltypemodule_p.h>
+#include <private/qqmlmetatyperegistrationfailurerecorder_p.h>
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qjsonarray.h>
 
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h
index f8c01ed876..b4ca92544b 100644
--- a/src/qml/qml/qqmlimport_p.h
+++ b/src/qml/qml/qqmlimport_p.h
@@ -45,7 +45,7 @@
 #include <QtCore/qset.h>
 #include <QtCore/qstringlist.h>
 #include <private/qqmldirparser_p.h>
-#include <private/qqmlmetatype_p.h>
+#include <private/qqmltype_p.h>
 #include <private/qhashedstring_p.h>
 
 //
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 032ee7d6fc..1e7585ffc9 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -37,632 +37,26 @@
 **
 ****************************************************************************/
 
-#include <QtQml/qqmlprivate.h>
 #include "qqmlmetatype_p.h"
 
-#include <private/qqmlproxymetaobject_p.h>
-#include <private/qqmlcustomparser_p.h>
-#include <private/qhashedstring_p.h>
-#include <private/qqmlimport_p.h>
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qbitarray.h>
-#include <QtCore/qreadwritelock.h>
-#include <QtCore/private/qmetaobject_p.h>
-#include <QtCore/qloggingcategory.h>
-
-#include <qmetatype.h>
-#include <qobjectdefs.h>
-#include <qbytearray.h>
-#include <qreadwritelock.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvector.h>
+#include <private/qqmlmetatypedata_p.h>
+#include <private/qqmltypemodule_p_p.h>
+#include <private/qqmltype_p_p.h>
+#include <private/qqmltypeloader_p.h>
 
-#include <ctype.h>
-#include "qqmlcomponent.h"
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qloggingcategory.h>
 
 Q_DECLARE_LOGGING_CATEGORY(DBG_DISK_CACHE)
 
 QT_BEGIN_NAMESPACE
 
-struct QQmlMetaTypeData
-{
-    QQmlMetaTypeData();
-    ~QQmlMetaTypeData();
-    void registerType(QQmlTypePrivate *priv);
-    QList<QQmlType> types;
-    QSet<QQmlType> undeletableTypes;
-    typedef QHash<int, QQmlTypePrivate *> Ids;
-    Ids idToType;
-    typedef QHash<QHashedStringRef, QQmlTypePrivate *> Names;
-    Names nameToType;
-    typedef QHash<QUrl, QQmlTypePrivate *> Files; //For file imported composite types only
-    Files urlToType;
-    Files urlToNonFileImportType; // For non-file imported composite and composite
-                                  // singleton types. This way we can locate any
-                                  // of them by url, even if it was registered as
-                                  // a module via QQmlPrivate::RegisterCompositeType
-    typedef QHash<const QMetaObject *, QQmlTypePrivate *> MetaObjects;
-    MetaObjects metaObjectToType;
-    typedef QHash<int, QQmlMetaType::StringConverter> StringConverters;
-    StringConverters stringConverters;
-
-    struct VersionedUri {
-        VersionedUri()
-        : majorVersion(0) {}
-        VersionedUri(const QHashedString &uri, int majorVersion)
-        : uri(uri), majorVersion(majorVersion) {}
-        bool operator==(const VersionedUri &other) const {
-            return other.majorVersion == majorVersion && other.uri == uri;
-        }
-        QHashedString uri;
-        int majorVersion;
-    };
-    typedef QHash<VersionedUri, QQmlTypeModule *> TypeModules;
-    TypeModules uriToModule;
-
-    QBitArray objects;
-    QBitArray interfaces;
-    QBitArray lists;
-
-    QList<QQmlPrivate::AutoParentFunction> parentFunctions;
-    QVector<QQmlPrivate::QmlUnitCacheLookupFunction> lookupCachedQmlUnit;
-
-    QSet<QString> protectedNamespaces;
-
-    QString typeRegistrationNamespace;
-
-    QHash<int, int> qmlLists;
-
-    QHash<const QMetaObject *, QQmlPropertyCache *> propertyCaches;
-    QQmlPropertyCache *propertyCache(const QMetaObject *metaObject);
-    QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion);
-
-    void startRecordingTypeRegFailures(QStringList *storage)
-    { typeRegistrationFailures = storage; }
-    void stopRecordingTypeRegFailures()
-    { startRecordingTypeRegFailures(nullptr); }
-    void recordTypeRegFailure(const QString &message)
-    {
-        if (typeRegistrationFailures)
-            typeRegistrationFailures->append(message);
-        else
-            qWarning("%s", message.toUtf8().constData());
-    }
-
-private:
-    QStringList *typeRegistrationFailures = nullptr;
-};
-
-struct EnumInfo {
-    QStringList path;
-    QString metaObjectName;
-    QString enumName;
-    QString enumKey;
-    QString metaEnumScope;
-    bool scoped;
-};
-
-class QQmlTypeModulePrivate
-{
-public:
-    QQmlTypeModulePrivate()
-    : minMinorVersion(INT_MAX), maxMinorVersion(0), locked(false) {}
-
-    static QQmlTypeModulePrivate* get(QQmlTypeModule* q) { return q->d; }
-
-    QQmlMetaTypeData::VersionedUri uri;
-
-    int minMinorVersion;
-    int maxMinorVersion;
-    bool locked;
-
-    void add(QQmlTypePrivate *);
-    void remove(const QQmlTypePrivate *type);
-
-    typedef QStringHash<QList<QQmlTypePrivate *> > TypeHash;
-    TypeHash typeHash;
-};
-
 Q_GLOBAL_STATIC(QQmlMetaTypeData, metaTypeData)
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, metaTypeDataLock, (QMutex::Recursive))
 
-static uint qHash(const QQmlMetaTypeData::VersionedUri &v)
-{
-    return v.uri.hash() ^ qHash(v.majorVersion);
-}
-
-QQmlMetaTypeRegistrationFailureRecorder::QQmlMetaTypeRegistrationFailureRecorder()
-{
-    metaTypeData()->startRecordingTypeRegFailures(&_failures);
-}
-
-QQmlMetaTypeRegistrationFailureRecorder::~QQmlMetaTypeRegistrationFailureRecorder()
-{
-    metaTypeData()->stopRecordingTypeRegFailures();
-}
-
-QQmlMetaTypeData::QQmlMetaTypeData()
-{
-}
-
-QQmlMetaTypeData::~QQmlMetaTypeData()
-{
-    for (TypeModules::const_iterator i = uriToModule.constBegin(), cend = uriToModule.constEnd(); i != cend; ++i)
-        delete *i;
-    for (QHash<const QMetaObject *, QQmlPropertyCache *>::Iterator it = propertyCaches.begin(), end = propertyCaches.end();
-         it != end; ++it)
-        (*it)->release();
-}
-
-class QQmlTypePrivate
-{
-    Q_DISABLE_COPY(QQmlTypePrivate)
-public:
-    QQmlTypePrivate(QQmlType::RegistrationType type);
-    ~QQmlTypePrivate();
-
-    void init() const;
-    void initEnums(const QQmlPropertyCache *cache = nullptr) const;
-    void insertEnums(const QMetaObject *metaObject) const;
-    void insertEnumsFromPropertyCache(const QQmlPropertyCache *cache) const;
-
-    QAtomicInt refCount;
-    QQmlType::RegistrationType regType;
-
-    struct QQmlCppTypeData
-    {
-        int allocationSize;
-        void (*newFunc)(void *);
-        QString noCreationReason;
-        int parserStatusCast;
-        QObject *(*extFunc)(QObject *);
-        const QMetaObject *extMetaObject;
-        QQmlCustomParser *customParser;
-        QQmlAttachedPropertiesFunc attachedPropertiesFunc;
-        const QMetaObject *attachedPropertiesType;
-        int attachedPropertiesId;
-        int propertyValueSourceCast;
-        int propertyValueInterceptorCast;
-        bool registerEnumClassesUnscoped;
-    };
-
-    struct QQmlSingletonTypeData
-    {
-        QQmlType::SingletonInstanceInfo *singletonInstanceInfo;
-    };
-
-    struct QQmlCompositeTypeData
-    {
-        QUrl url;
-    };
-
-    union extraData {
-        QQmlCppTypeData* cd;
-        QQmlSingletonTypeData* sd;
-        QQmlCompositeTypeData* fd;
-    } extraData;
-
-    const char *iid;
-    QHashedString module;
-    QString name;
-    QString elementName;
-    int version_maj;
-    int version_min;
-    int typeId;
-    int listId;
-    int revision;
-    mutable bool containsRevisionedAttributes;
-    mutable QQmlType superType;
-    const QMetaObject *baseMetaObject;
-
-    int index;
-    mutable volatile bool isSetup:1;
-    mutable volatile bool isEnumSetup:1;
-    mutable bool haveSuperType:1;
-    mutable QList<QQmlProxyMetaObject::ProxyData> metaObjects;
-    mutable QStringHash<int> enums;
-    mutable QStringHash<int> scopedEnumIndex; // maps from enum name to index in scopedEnums
-    mutable QList<QStringHash<int>*> scopedEnums;
-
-    static QHash<const QMetaObject *, int> attachedPropertyIds;
-
-    struct PropertyCacheByMinorVersion
-    {
-        PropertyCacheByMinorVersion() : cache(nullptr), minorVersion(-1) {}
-        explicit PropertyCacheByMinorVersion(QQmlPropertyCache *pc, int ver) : cache(pc), minorVersion(ver) {}
-        QQmlPropertyCachePtr cache;
-        int minorVersion;
-    };
-    QVector<PropertyCacheByMinorVersion> propertyCaches;
-    QQmlPropertyCache *propertyCacheForMinorVersion(int minorVersion) const;
-    void setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache);
-private:
-    void createListOfPossibleConflictingItems(const QMetaObject *metaObject, QList<EnumInfo> &enumInfoList, QStringList path) const;
-    void createEnumConflictReport(const QMetaObject *metaObject, const QString &conflictingKey) const;
-};
-
-void QQmlMetaTypeData::registerType(QQmlTypePrivate *priv)
-{
-    for (int i = 0; i < types.count(); ++i) {
-        if (!types.at(i).isValid()) {
-            types[i] = QQmlType(priv);
-            priv->index = i;
-            return;
-        }
-    }
-    types.append(QQmlType(priv));
-    priv->index = types.count() - 1;
-}
-
-void QQmlType::SingletonInstanceInfo::init(QQmlEngine *e)
-{
-    if (scriptCallback && scriptApi(e).isUndefined()) {
-        QJSValue value = scriptCallback(e, e);
-        if (value.isQObject()) {
-            QObject *o = value.toQObject();
-            // even though the object is defined in C++, qmlContext(obj) and qmlEngine(obj)
-            // should behave identically to QML singleton types.
-            e->setContextForObject(o, new QQmlContext(e->rootContext(), e));
-        }
-        setScriptApi(e, value);
-    } else if (qobjectCallback && !qobjectApi(e)) {
-        QObject *o = qobjectCallback(e, e);
-        setQObjectApi(e, o);
-        if (!o) {
-            qFatal("qmlRegisterSingletonType(): \"%s\" is not available because the callback function returns a null pointer.", qPrintable(typeName));
-        }
-        // if this object can use a property cache, create it now
-        QQmlData::ensurePropertyCache(e, o);
-        // even though the object is defined in C++, qmlContext(obj) and qmlEngine(obj)
-        // should behave identically to QML singleton types.
-        e->setContextForObject(o, new QQmlContext(e->rootContext(), e));
-    } else if (!url.isEmpty() && !qobjectApi(e)) {
-        QQmlComponent component(e, url, QQmlComponent::PreferSynchronous);
-        QObject *o = component.beginCreate(e->rootContext());
-        setQObjectApi(e, o);
-        if (o)
-            component.completeCreate();
-    }
-}
-
-void QQmlType::SingletonInstanceInfo::destroy(QQmlEngine *e)
-{
-    // cleans up the engine-specific singleton instances if they exist.
-    scriptApis.remove(e);
-    QObject *o = qobjectApis.take(e);
-    if (o) {
-        QQmlData *ddata = QQmlData::get(o, false);
-        if (url.isEmpty() && ddata && ddata->indestructible && ddata->explicitIndestructibleSet)
-            return;
-        delete o;
-    }
-}
-
-void QQmlType::SingletonInstanceInfo::setQObjectApi(QQmlEngine *e, QObject *o)
-{
-    qobjectApis.insert(e, o);
-}
-
-QObject *QQmlType::SingletonInstanceInfo::qobjectApi(QQmlEngine *e) const
-{
-    return qobjectApis.value(e);
-}
-
-void QQmlType::SingletonInstanceInfo::setScriptApi(QQmlEngine *e, const QJSValue &v)
-{
-    scriptApis.insert(e, v);
-}
-
-QJSValue QQmlType::SingletonInstanceInfo::scriptApi(QQmlEngine *e) const
-{
-    return scriptApis.value(e);
-}
-
-QHash<const QMetaObject *, int> QQmlTypePrivate::attachedPropertyIds;
-
-QQmlTypePrivate::QQmlTypePrivate(QQmlType::RegistrationType type)
-: refCount(1), regType(type), iid(nullptr), typeId(0), listId(0), revision(0),
-    containsRevisionedAttributes(false), baseMetaObject(nullptr),
-    index(-1), isSetup(false), isEnumSetup(false), haveSuperType(false)
-{
-    switch (type) {
-    case QQmlType::CppType:
-        extraData.cd = new QQmlCppTypeData;
-        extraData.cd->allocationSize = 0;
-        extraData.cd->newFunc = nullptr;
-        extraData.cd->parserStatusCast = -1;
-        extraData.cd->extFunc = nullptr;
-        extraData.cd->extMetaObject = nullptr;
-        extraData.cd->customParser = nullptr;
-        extraData.cd->attachedPropertiesFunc = nullptr;
-        extraData.cd->attachedPropertiesType = nullptr;
-        extraData.cd->propertyValueSourceCast = -1;
-        extraData.cd->propertyValueInterceptorCast = -1;
-        extraData.cd->registerEnumClassesUnscoped = true;
-        break;
-    case QQmlType::SingletonType:
-    case QQmlType::CompositeSingletonType:
-        extraData.sd = new QQmlSingletonTypeData;
-        extraData.sd->singletonInstanceInfo = nullptr;
-        break;
-    case QQmlType::InterfaceType:
-        extraData.cd = nullptr;
-        break;
-    case QQmlType::CompositeType:
-        extraData.fd = new QQmlCompositeTypeData;
-        break;
-    default: qFatal("QQmlTypePrivate Internal Error.");
-    }
-}
-
-QQmlTypePrivate::~QQmlTypePrivate()
-{
-    qDeleteAll(scopedEnums);
-    switch (regType) {
-    case QQmlType::CppType:
-        delete extraData.cd->customParser;
-        delete extraData.cd;
-        break;
-    case QQmlType::SingletonType:
-    case QQmlType::CompositeSingletonType:
-        delete extraData.sd->singletonInstanceInfo;
-        delete extraData.sd;
-        break;
-    case QQmlType::CompositeType:
-        delete extraData.fd;
-        break;
-    default: //Also InterfaceType, because it has no extra data
-        break;
-    }
-}
-
-QQmlType::QQmlType(QQmlMetaTypeData *data, const QQmlPrivate::RegisterInterface &interface)
-    : d(new QQmlTypePrivate(InterfaceType))
-{
-    d->iid = interface.iid;
-    d->typeId = interface.typeId;
-    d->listId = interface.listId;
-    d->isSetup = true;
-    d->version_maj = 0;
-    d->version_min = 0;
-    data->registerType(d);
-}
-
-QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterSingletonType &type)
-    : d(new QQmlTypePrivate(SingletonType))
-{
-    data->registerType(d);
-
-    d->elementName = elementName;
-    d->module = QString::fromUtf8(type.uri);
-
-    d->version_maj = type.versionMajor;
-    d->version_min = type.versionMinor;
-
-    if (type.qobjectApi) {
-        if (type.version >= 1) // static metaobject added in version 1
-            d->baseMetaObject = type.instanceMetaObject;
-        if (type.version >= 2) // typeId added in version 2
-            d->typeId = type.typeId;
-        if (type.version >= 2) // revisions added in version 2
-            d->revision = type.revision;
-    }
-
-    d->extraData.sd->singletonInstanceInfo = new SingletonInstanceInfo;
-    d->extraData.sd->singletonInstanceInfo->scriptCallback = type.scriptApi;
-    d->extraData.sd->singletonInstanceInfo->qobjectCallback = type.qobjectApi;
-    d->extraData.sd->singletonInstanceInfo->typeName = QString::fromUtf8(type.typeName);
-    d->extraData.sd->singletonInstanceInfo->instanceMetaObject
-        = (type.qobjectApi && type.version >= 1) ? type.instanceMetaObject : nullptr;
-}
-
-QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterCompositeSingletonType &type)
-    : d(new QQmlTypePrivate(CompositeSingletonType))
-{
-    data->registerType(d);
-
-    d->elementName = elementName;
-    d->module = QString::fromUtf8(type.uri);
-
-    d->version_maj = type.versionMajor;
-    d->version_min = type.versionMinor;
-
-    d->extraData.sd->singletonInstanceInfo = new SingletonInstanceInfo;
-    d->extraData.sd->singletonInstanceInfo->url = QQmlTypeLoader::normalize(type.url);
-    d->extraData.sd->singletonInstanceInfo->typeName = QString::fromUtf8(type.typeName);
-}
-
-QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterType &type)
-    : d(new QQmlTypePrivate(CppType))
-{
-    data->registerType(d);
-
-    d->elementName = elementName;
-    d->module = QString::fromUtf8(type.uri);
-
-    d->version_maj = type.versionMajor;
-    d->version_min = type.versionMinor;
-    if (type.version >= 1) // revisions added in version 1
-        d->revision = type.revision;
-    d->typeId = type.typeId;
-    d->listId = type.listId;
-    d->extraData.cd->allocationSize = type.objectSize;
-    d->extraData.cd->newFunc = type.create;
-    d->extraData.cd->noCreationReason = type.noCreationReason;
-    d->baseMetaObject = type.metaObject;
-    d->extraData.cd->attachedPropertiesFunc = type.attachedPropertiesFunction;
-    d->extraData.cd->attachedPropertiesType = type.attachedPropertiesMetaObject;
-    if (d->extraData.cd->attachedPropertiesType) {
-        auto iter = QQmlTypePrivate::attachedPropertyIds.find(d->baseMetaObject);
-        if (iter == QQmlTypePrivate::attachedPropertyIds.end())
-            iter = QQmlTypePrivate::attachedPropertyIds.insert(d->baseMetaObject, d->index);
-        d->extraData.cd->attachedPropertiesId = *iter;
-    } else {
-        d->extraData.cd->attachedPropertiesId = -1;
-    }
-    d->extraData.cd->parserStatusCast = type.parserStatusCast;
-    d->extraData.cd->propertyValueSourceCast = type.valueSourceCast;
-    d->extraData.cd->propertyValueInterceptorCast = type.valueInterceptorCast;
-    d->extraData.cd->extFunc = type.extensionObjectCreate;
-    d->extraData.cd->customParser = type.customParser;
-    d->extraData.cd->registerEnumClassesUnscoped = true;
-
-    if (type.extensionMetaObject)
-        d->extraData.cd->extMetaObject = type.extensionMetaObject;
-
-    // Check if the user wants only scoped enum classes
-    if (d->baseMetaObject) {
-        auto indexOfClassInfo = d->baseMetaObject->indexOfClassInfo("RegisterEnumClassesUnscoped");
-        if (indexOfClassInfo != -1 && QString::fromUtf8(d->baseMetaObject->classInfo(indexOfClassInfo).value()) == QLatin1String("false"))
-            d->extraData.cd->registerEnumClassesUnscoped = false;
-    }
-}
-
-QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterCompositeType &type)
-    : d(new QQmlTypePrivate(CompositeType))
-{
-    data->registerType(d);
-
-    d->elementName = elementName;
-
-    d->module = QString::fromUtf8(type.uri);
-    d->version_maj = type.versionMajor;
-    d->version_min = type.versionMinor;
-
-    d->extraData.fd->url = QQmlTypeLoader::normalize(type.url);
-}
-
-QQmlType::QQmlType()
-    : d(nullptr)
-{
-}
-
-QQmlType::QQmlType(const QQmlType &other)
-    : d(other.d)
-{
-    if (d)
-        d->refCount.ref();
-}
-
-QQmlType &QQmlType::operator =(const QQmlType &other)
-{
-    if (d != other.d) {
-        if (d && !d->refCount.deref())
-            delete d;
-        d = other.d;
-        if (d)
-            d->refCount.ref();
-    }
-    return *this;
-}
-
-QQmlType::QQmlType(QQmlTypePrivate *priv)
-    : d(priv)
-{
-    if (d)
-        d->refCount.ref();
-}
-
-QQmlType::~QQmlType()
-{
-    if (d && !d->refCount.deref()) {
-        // If attached properties were successfully registered, deregister them.
-        // (They may not have been registered if some other type used the same baseMetaObject)
-        if (d->regType == CppType && d->extraData.cd->attachedPropertiesType) {
-            auto it = QQmlTypePrivate::attachedPropertyIds.find(d->baseMetaObject);
-            if (it != QQmlTypePrivate::attachedPropertyIds.end() && *it == d->index)
-                QQmlTypePrivate::attachedPropertyIds.erase(it);
-        }
-        delete d;
-    }
-}
-
-QHashedString QQmlType::module() const
-{
-    if (!d)
-        return QHashedString();
-    return d->module;
-}
-
-int QQmlType::majorVersion() const
-{
-    if (!d)
-        return -1;
-    return d->version_maj;
-}
-
-int QQmlType::minorVersion() const
-{
-    if (!d)
-        return -1;
-    return d->version_min;
-}
-
-bool QQmlType::availableInVersion(int vmajor, int vminor) const
-{
-    Q_ASSERT(vmajor >= 0 && vminor >= 0);
-    if (!d)
-        return false;
-    return vmajor == d->version_maj && vminor >= d->version_min;
-}
-
-bool QQmlType::availableInVersion(const QHashedStringRef &module, int vmajor, int vminor) const
-{
-    Q_ASSERT(vmajor >= 0 && vminor >= 0);
-    if (!d)
-        return false;
-    return module == d->module && vmajor == d->version_maj && vminor >= d->version_min;
-}
-
-// returns the nearest _registered_ super class
-QQmlType QQmlType::superType() const
-{
-    if (!d)
-        return QQmlType();
-    if (!d->haveSuperType && d->baseMetaObject) {
-        const QMetaObject *mo = d->baseMetaObject->superClass();
-        while (mo && !d->superType.isValid()) {
-            d->superType = QQmlMetaType::qmlType(mo, d->module, d->version_maj, d->version_min);
-            mo = mo->superClass();
-        }
-        d->haveSuperType = true;
-    }
-
-    return d->superType;
-}
-
-QQmlType QQmlType::resolveCompositeBaseType(QQmlEnginePrivate *engine) const
-{
-    Q_ASSERT(isComposite());
-    if (!engine || !d)
-        return QQmlType();
-    QQmlRefPointer<QQmlTypeData> td(engine->typeLoader.getType(sourceUrl()));
-    if (td.isNull() || !td->isComplete())
-        return QQmlType();
-    QV4::CompiledData::CompilationUnit *compilationUnit = td->compilationUnit();
-    const QMetaObject *mo = compilationUnit->rootPropertyCache()->firstCppMetaObject();
-    return QQmlMetaType::qmlType(mo);
-}
-
-QQmlPropertyCache *QQmlType::compositePropertyCache(QQmlEnginePrivate *engine) const
-{
-    // similar logic to resolveCompositeBaseType
-    Q_ASSERT(isComposite());
-    if (!engine)
-        return nullptr;
-    QQmlRefPointer<QQmlTypeData> td(engine->typeLoader.getType(sourceUrl()));
-    if (td.isNull() || !td->isComplete())
-        return nullptr;
-    QV4::CompiledData::CompilationUnit *compilationUnit = td->compilationUnit();
-    return compilationUnit->rootPropertyCache().data();
-}
-
-static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
-                  const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd)
+void QQmlMetaType::clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
+                         const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd)
 {
     // Set classname
     builder.setClassName(ignoreEnd->className());
@@ -729,909 +123,7 @@ static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
     }
 }
 
-static bool isPropertyRevisioned(const QMetaObject *mo, int index)
-{
-    int i = index;
-    i -= mo->propertyOffset();
-    if (i < 0 && mo->d.superdata)
-        return isPropertyRevisioned(mo->d.superdata, index);
-
-    const QMetaObjectPrivate *mop = reinterpret_cast<const QMetaObjectPrivate*>(mo->d.data);
-    if (i >= 0 && i < mop->propertyCount) {
-        int handle = mop->propertyData + 3*i;
-        int flags = mo->d.data[handle + 2];
-
-        return (flags & Revisioned);
-    }
-
-    return false;
-}
-
-void QQmlTypePrivate::init() const
-{
-    if (isSetup)
-        return;
-
-    QMutexLocker lock(metaTypeDataLock());
-    if (isSetup)
-        return;
-
-    const QMetaObject *mo = baseMetaObject;
-    if (!mo) {
-        // version 0 singleton type without metaobject information
-        return;
-    }
-
-    if (regType == QQmlType::CppType) {
-        // Setup extended meta object
-        // XXX - very inefficient
-        if (extraData.cd->extFunc) {
-            QMetaObjectBuilder builder;
-            clone(builder, extraData.cd->extMetaObject, extraData.cd->extMetaObject, extraData.cd->extMetaObject);
-            builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-            QMetaObject *mmo = builder.toMetaObject();
-            mmo->d.superdata = mo;
-            QQmlProxyMetaObject::ProxyData data = { mmo, extraData.cd->extFunc, 0, 0 };
-            metaObjects << data;
-        }
-    }
-
-    mo = mo->d.superdata;
-    while(mo) {
-        QQmlTypePrivate *t = metaTypeData()->metaObjectToType.value(mo);
-        if (t) {
-            if (t->regType == QQmlType::CppType) {
-                if (t->extraData.cd->extFunc) {
-                    QMetaObjectBuilder builder;
-                    clone(builder, t->extraData.cd->extMetaObject, t->baseMetaObject, baseMetaObject);
-                    builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-                    QMetaObject *mmo = builder.toMetaObject();
-                    mmo->d.superdata = baseMetaObject;
-                    if (!metaObjects.isEmpty())
-                        metaObjects.constLast().metaObject->d.superdata = mmo;
-                    QQmlProxyMetaObject::ProxyData data = { mmo, t->extraData.cd->extFunc, 0, 0 };
-                    metaObjects << data;
-                }
-            }
-        }
-        mo = mo->d.superdata;
-    }
-
-    for (int ii = 0; ii < metaObjects.count(); ++ii) {
-        metaObjects[ii].propertyOffset =
-            metaObjects.at(ii).metaObject->propertyOffset();
-        metaObjects[ii].methodOffset =
-            metaObjects.at(ii).metaObject->methodOffset();
-    }
-
-    // Check for revisioned details
-    {
-        const QMetaObject *mo = nullptr;
-        if (metaObjects.isEmpty())
-            mo = baseMetaObject;
-        else
-            mo = metaObjects.constFirst().metaObject;
-
-        for (int ii = 0; !containsRevisionedAttributes && ii < mo->propertyCount(); ++ii) {
-            if (isPropertyRevisioned(mo, ii))
-                containsRevisionedAttributes = true;
-        }
-
-        for (int ii = 0; !containsRevisionedAttributes && ii < mo->methodCount(); ++ii) {
-            if (mo->method(ii).revision() != 0)
-                containsRevisionedAttributes = true;
-        }
-    }
-
-    isSetup = true;
-    lock.unlock();
-}
-
-void QQmlTypePrivate::initEnums(const QQmlPropertyCache *cache) const
-{
-    if (isEnumSetup) return;
-
-    init();
-
-    QMutexLocker lock(metaTypeDataLock());
-    if (isEnumSetup) return;
-
-    if (cache)
-        insertEnumsFromPropertyCache(cache);
-    if (baseMetaObject) // could be singleton type without metaobject
-        insertEnums(baseMetaObject);
-
-    isEnumSetup = true;
-}
-
-void QQmlTypePrivate::insertEnums(const QMetaObject *metaObject) const
-{
-    // Add any enum values defined by 'related' classes
-    if (metaObject->d.relatedMetaObjects) {
-        const auto *related = metaObject->d.relatedMetaObjects;
-        if (related) {
-            while (*related)
-                insertEnums(*related++);
-        }
-    }
-
-    QSet<QString> localEnums;
-    const QMetaObject *localMetaObject = nullptr;
-
-    // Add any enum values defined by this class, overwriting any inherited values
-    for (int ii = 0; ii < metaObject->enumeratorCount(); ++ii) {
-        QMetaEnum e = metaObject->enumerator(ii);
-        const bool isScoped = e.isScoped();
-        QStringHash<int> *scoped = isScoped ? new QStringHash<int>() : nullptr;
-
-        // We allow enums in sub-classes to overwrite enums from base-classes, such as
-        // ListView.Center (from enum PositionMode) overwriting Item.Center (from enum TransformOrigin).
-        // This is acceptable because the _use_ of the enum from the QML side requires qualification
-        // anyway, i.e. ListView.Center vs. Item.Center.
-        // However if a class defines two enums with the same value, then that must produce a warning
-        // because it represents a valid conflict.
-        if (e.enclosingMetaObject() != localMetaObject) {
-            localEnums.clear();
-            localMetaObject = e.enclosingMetaObject();
-        }
-
-        for (int jj = 0; jj < e.keyCount(); ++jj) {
-            const QString key = QString::fromUtf8(e.key(jj));
-            const int value = e.value(jj);
-             if (!isScoped || (regType == QQmlType::CppType && extraData.cd->registerEnumClassesUnscoped)) {
-                 if (localEnums.contains(key)) {
-                     auto existingEntry = enums.find(key);
-                     if (existingEntry != enums.end() && existingEntry.value() != value) {
-                         qWarning("Previously registered enum will be overwritten due to name clash: %s.%s", metaObject->className(), key.toUtf8().constData());
-                         createEnumConflictReport(metaObject, key);
-                     }
-                 } else {
-                     localEnums.insert(key);
-                 }
-                 enums.insert(key, value);
-            }
-            if (isScoped)
-                scoped->insert(key, value);
-        }
-
-        if (isScoped) {
-            scopedEnums << scoped;
-            scopedEnumIndex.insert(QString::fromUtf8(e.name()), scopedEnums.count()-1);
-        }
-    }
-}
-
-void QQmlTypePrivate::createListOfPossibleConflictingItems(const QMetaObject *metaObject, QList<EnumInfo> &enumInfoList, QStringList path) const
-{
-    path.append(QString::fromUtf8(metaObject->className()));
-
-    if (metaObject->d.relatedMetaObjects) {
-        const auto *related = metaObject->d.relatedMetaObjects;
-        if (related) {
-            while (*related)
-                createListOfPossibleConflictingItems(*related++, enumInfoList, path);
-        }
-    }
-
-    for (int ii = 0; ii < metaObject->enumeratorCount(); ++ii) {
-        const auto e = metaObject->enumerator(ii);
-
-        for (int jj = 0; jj < e.keyCount(); ++jj) {
-            const QString key = QString::fromUtf8(e.key(jj));
-
-            EnumInfo enumInfo;
-            enumInfo.metaObjectName = QString::fromUtf8(metaObject->className());
-            enumInfo.enumName = QString::fromUtf8(e.name());
-            enumInfo.enumKey = key;
-            enumInfo.scoped = e.isScoped();
-            enumInfo.path = path;
-            enumInfo.metaEnumScope = QString::fromUtf8(e.scope());
-            enumInfoList.append(enumInfo);
-        }
-    }
-}
-
-void QQmlTypePrivate::createEnumConflictReport(const QMetaObject *metaObject, const QString &conflictingKey) const
-{
-    QList<EnumInfo> enumInfoList;
-
-    if (baseMetaObject) // prefer baseMetaObject if available
-        metaObject = baseMetaObject;
-
-    if (!metaObject) { // If there is no metaObject at all return early
-        qWarning() << "No meta object information available. Skipping conflict analysis.";
-        return;
-    }
-
-    createListOfPossibleConflictingItems(metaObject, enumInfoList, QStringList());
-
-    qWarning().noquote() << QLatin1String("Possible conflicting items:");
-    // find items with conflicting key
-    for (const auto i : enumInfoList) {
-        if (i.enumKey == conflictingKey)
-            qWarning().noquote().nospace() << "    " << i.metaObjectName << "." << i.enumName << "." << i.enumKey << " from scope "
-                                           << i.metaEnumScope << " injected by " << i.path.join(QLatin1String("->"));
-    }
-}
-
-void QQmlTypePrivate::insertEnumsFromPropertyCache(const QQmlPropertyCache *cache) const
-{
-    const QMetaObject *cppMetaObject = cache->firstCppMetaObject();
-
-    while (cache && cache->metaObject() != cppMetaObject) {
-
-        int count = cache->qmlEnumCount();
-        for (int ii = 0; ii < count; ++ii) {
-            QStringHash<int> *scoped = new QStringHash<int>();
-            QQmlEnumData *enumData = cache->qmlEnum(ii);
-
-            for (int jj = 0; jj < enumData->values.count(); ++jj) {
-                const QQmlEnumValue &value = enumData->values.at(jj);
-                enums.insert(value.namedValue, value.value);
-                scoped->insert(value.namedValue, value.value);
-            }
-            scopedEnums << scoped;
-            scopedEnumIndex.insert(enumData->name, scopedEnums.count()-1);
-        }
-        cache = cache->parent();
-    }
-    insertEnums(cppMetaObject);
-}
-
-
-QQmlPropertyCache *QQmlTypePrivate::propertyCacheForMinorVersion(int minorVersion) const
-{
-    for (int i = 0; i < propertyCaches.count(); ++i)
-        if (propertyCaches.at(i).minorVersion == minorVersion)
-            return propertyCaches.at(i).cache.data();
-    return nullptr;
-}
-
-void QQmlTypePrivate::setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache)
-{
-    for (int i = 0; i < propertyCaches.count(); ++i) {
-        if (propertyCaches.at(i).minorVersion == minorVersion) {
-            propertyCaches[i].cache = cache;
-            return;
-        }
-    }
-    propertyCaches.append(PropertyCacheByMinorVersion(cache, minorVersion));
-}
-
-QByteArray QQmlType::typeName() const
-{
-    if (d) {
-        if (d->regType == SingletonType || d->regType == CompositeSingletonType)
-            return d->extraData.sd->singletonInstanceInfo->typeName.toUtf8();
-        else if (d->baseMetaObject)
-            return d->baseMetaObject->className();
-    }
-    return QByteArray();
-}
-
-QString QQmlType::elementName() const
-{
-    if (!d)
-        return QString();
-    return d->elementName;
-}
-
-QString QQmlType::qmlTypeName() const
-{
-    if (!d)
-        return QString();
-    if (d->name.isEmpty()) {
-        if (!d->module.isEmpty())
-            d->name = static_cast<QString>(d->module) + QLatin1Char('/') + d->elementName;
-        else
-            d->name = d->elementName;
-    }
-
-    return d->name;
-}
-
-QObject *QQmlType::create() const
-{
-    if (!d || !isCreatable())
-        return nullptr;
-
-    d->init();
-
-    QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize);
-    d->extraData.cd->newFunc(rv);
-
-    if (rv && !d->metaObjects.isEmpty())
-        (void)new QQmlProxyMetaObject(rv, &d->metaObjects);
-
-    return rv;
-}
-
-void QQmlType::create(QObject **out, void **memory, size_t additionalMemory) const
-{
-    if (!d || !isCreatable())
-        return;
-
-    d->init();
-
-    QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize + additionalMemory);
-    d->extraData.cd->newFunc(rv);
-
-    if (rv && !d->metaObjects.isEmpty())
-        (void)new QQmlProxyMetaObject(rv, &d->metaObjects);
-
-    *out = rv;
-    *memory = ((char *)rv) + d->extraData.cd->allocationSize;
-}
-
-QQmlType::SingletonInstanceInfo *QQmlType::singletonInstanceInfo() const
-{
-    if (!d)
-        return nullptr;
-    if (d->regType != SingletonType && d->regType != CompositeSingletonType)
-        return nullptr;
-    return d->extraData.sd->singletonInstanceInfo;
-}
-
-QQmlCustomParser *QQmlType::customParser() const
-{
-    if (!d)
-        return nullptr;
-    if (d->regType != CppType)
-        return nullptr;
-    return d->extraData.cd->customParser;
-}
-
-QQmlType::CreateFunc QQmlType::createFunction() const
-{
-    if (!d || d->regType != CppType)
-        return nullptr;
-    return d->extraData.cd->newFunc;
-}
-
-QString QQmlType::noCreationReason() const
-{
-    if (!d || d->regType != CppType)
-        return QString();
-    return d->extraData.cd->noCreationReason;
-}
-
-bool QQmlType::isCreatable() const
-{
-    return d && d->regType == CppType && d->extraData.cd->newFunc;
-}
-
-QQmlType::ExtensionFunc QQmlType::extensionFunction() const
-{
-    if (!d || d->regType != CppType)
-        return nullptr;
-    return d->extraData.cd->extFunc;
-}
-
-bool QQmlType::isExtendedType() const
-{
-    if (!d)
-        return false;
-    d->init();
-
-    return !d->metaObjects.isEmpty();
-}
-
-bool QQmlType::isSingleton() const
-{
-    return d && (d->regType == SingletonType || d->regType == CompositeSingletonType);
-}
-
-bool QQmlType::isInterface() const
-{
-    return d && d->regType == InterfaceType;
-}
-
-bool QQmlType::isComposite() const
-{
-    return d && (d->regType == CompositeType || d->regType == CompositeSingletonType);
-}
-
-bool QQmlType::isCompositeSingleton() const
-{
-    return d && d->regType == CompositeSingletonType;
-}
-
-int QQmlType::typeId() const
-{
-    return d ? d->typeId : -1;
-}
-
-int QQmlType::qListTypeId() const
-{
-    return d ? d->listId : -1;
-}
-
-const QMetaObject *QQmlType::metaObject() const
-{
-    if (!d)
-        return nullptr;
-    d->init();
-
-    if (d->metaObjects.isEmpty())
-        return d->baseMetaObject;
-    else
-        return d->metaObjects.constFirst().metaObject;
-
-}
-
-const QMetaObject *QQmlType::baseMetaObject() const
-{
-    return d ? d->baseMetaObject : nullptr;
-}
-
-bool QQmlType::containsRevisionedAttributes() const
-{
-    if (!d)
-        return false;
-    d->init();
-
-    return d->containsRevisionedAttributes;
-}
-
-int QQmlType::metaObjectRevision() const
-{
-    return d ? d->revision : -1;
-}
-
-QQmlAttachedPropertiesFunc QQmlType::attachedPropertiesFunction(QQmlEnginePrivate *engine) const
-{
-    if (!d)
-        return nullptr;
-    if (d->regType == CppType)
-        return d->extraData.cd->attachedPropertiesFunc;
-
-    QQmlType base;
-    if (d->regType == CompositeType)
-        base = resolveCompositeBaseType(engine);
-    return base.attachedPropertiesFunction(engine);
-}
-
-const QMetaObject *QQmlType::attachedPropertiesType(QQmlEnginePrivate *engine) const
-{
-    if (!d)
-        return nullptr;
-    if (d->regType == CppType)
-        return d->extraData.cd->attachedPropertiesType;
-
-    QQmlType base;
-    if (d->regType == CompositeType)
-        base = resolveCompositeBaseType(engine);
-    return base.attachedPropertiesType(engine);
-}
-
-/*
-This is the id passed to qmlAttachedPropertiesById().  This is different from the index
-for the case that a single class is registered under two or more names (eg. Item in
-Qt 4.7 and QtQuick 1.0).
-*/
-int QQmlType::attachedPropertiesId(QQmlEnginePrivate *engine) const
-{
-    if (!d)
-        return -1;
-    if (d->regType == CppType)
-        return d->extraData.cd->attachedPropertiesId;
-
-    QQmlType base;
-    if (d->regType == CompositeType)
-        base = resolveCompositeBaseType(engine);
-    return base.attachedPropertiesId(engine);
-}
-
-int QQmlType::parserStatusCast() const
-{
-    if (!d || d->regType != CppType)
-        return -1;
-    return d->extraData.cd->parserStatusCast;
-}
-
-int QQmlType::propertyValueSourceCast() const
-{
-    if (!d || d->regType != CppType)
-        return -1;
-    return d->extraData.cd->propertyValueSourceCast;
-}
-
-int QQmlType::propertyValueInterceptorCast() const
-{
-    if (!d || d->regType != CppType)
-        return -1;
-    return d->extraData.cd->propertyValueInterceptorCast;
-}
-
-const char *QQmlType::interfaceIId() const
-{
-    if (!d || d->regType != InterfaceType)
-        return nullptr;
-    return d->iid;
-}
-
-int QQmlType::index() const
-{
-    return d ? d->index : -1;
-}
-
-QUrl QQmlType::sourceUrl() const
-{
-    if (d) {
-        if (d->regType == CompositeType)
-            return d->extraData.fd->url;
-        else if (d->regType == CompositeSingletonType)
-            return d->extraData.sd->singletonInstanceInfo->url;
-    }
-    return QUrl();
-}
-
-int QQmlType::enumValue(QQmlEnginePrivate *engine, const QHashedStringRef &name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->enums.value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::enumValue(QQmlEnginePrivate *engine, const QHashedCStringRef &name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->enums.value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::enumValue(QQmlEnginePrivate *engine, const QV4::String *name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->enums.value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QV4::String *name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->scopedEnumIndex.value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QString &name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->scopedEnumIndex.value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *name, bool *ok) const
-{
-    Q_UNUSED(engine)
-    Q_ASSERT(ok);
-    *ok = true;
-
-    if (d) {
-        Q_ASSERT(index > -1 && index < d->scopedEnums.count());
-        int *rv = d->scopedEnums.at(index)->value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &name, bool *ok) const
-{
-    Q_UNUSED(engine)
-    Q_ASSERT(ok);
-    *ok = true;
-
-    if (d) {
-        Q_ASSERT(index > -1 && index < d->scopedEnums.count());
-        int *rv = d->scopedEnums.at(index)->value(name);
-        if (rv)
-            return *rv;
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, const QByteArray &scopedEnumName, const QByteArray &name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->scopedEnumIndex.value(QHashedCStringRef(scopedEnumName.constData(), scopedEnumName.length()));
-        if (rv) {
-            int index = *rv;
-            Q_ASSERT(index > -1 && index < d->scopedEnums.count());
-            rv = d->scopedEnums.at(index)->value(QHashedCStringRef(name.constData(), name.length()));
-            if (rv)
-                return *rv;
-        }
-    }
-
-    *ok = false;
-    return -1;
-}
-
-int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, const QStringRef &scopedEnumName, const QStringRef &name, bool *ok) const
-{
-    Q_ASSERT(ok);
-    if (d) {
-        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
-        *ok = true;
-
-        d->initEnums(cache);
-
-        int *rv = d->scopedEnumIndex.value(QHashedStringRef(scopedEnumName));
-        if (rv) {
-            int index = *rv;
-            Q_ASSERT(index > -1 && index < d->scopedEnums.count());
-            rv = d->scopedEnums.at(index)->value(QHashedStringRef(name));
-            if (rv)
-                return *rv;
-        }
-    }
-
-    *ok = false;
-    return -1;
-}
-
-void QQmlType::refHandle(QQmlTypePrivate *priv)
-{
-    if (priv)
-        priv->refCount.ref();
-}
-
-void QQmlType::derefHandle(QQmlTypePrivate *priv)
-{
-    if (priv && !priv->refCount.deref())
-        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)
-{
-    for (typename QQmlTypeContainer::iterator it = container.begin(); it != container.end();) {
-        if (*it == reference)
-            it = container.erase(it);
-        else
-            ++it;
-    }
-}
-
-struct IsQQmlTypePrivate
-{
-    const QQmlTypePrivate *reference;
-    explicit IsQQmlTypePrivate(const QQmlTypePrivate *ref) : reference(ref) {}
-
-    bool operator()(const QQmlTypePrivate *priv) const { return reference == priv; }
-};
-}
-
-QQmlTypeModule::QQmlTypeModule()
-: d(new QQmlTypeModulePrivate)
-{
-}
-
-QQmlTypeModule::~QQmlTypeModule()
-{
-    delete d; d = nullptr;
-}
-
-QString QQmlTypeModule::module() const
-{
-    return d->uri.uri;
-}
-
-int QQmlTypeModule::majorVersion() const
-{
-    return d->uri.majorVersion;
-}
-
-int QQmlTypeModule::minimumMinorVersion() const
-{
-    return d->minMinorVersion;
-}
-
-int QQmlTypeModule::maximumMinorVersion() const
-{
-    return d->maxMinorVersion;
-}
-
-void QQmlTypeModulePrivate::add(QQmlTypePrivate *type)
-{
-    int minVersion = type->version_min;
-    minMinorVersion = qMin(minMinorVersion, minVersion);
-    maxMinorVersion = qMax(maxMinorVersion, minVersion);
-
-    QList<QQmlTypePrivate *> &list = typeHash[type->elementName];
-    for (int ii = 0; ii < list.count(); ++ii) {
-        Q_ASSERT(list.at(ii));
-        if (list.at(ii)->version_min < minVersion) {
-            list.insert(ii, type);
-            return;
-        }
-    }
-    list.append(type);
-}
-
-void QQmlTypeModulePrivate::remove(const QQmlTypePrivate *type)
-{
-    for (TypeHash::ConstIterator elementIt = typeHash.begin(); elementIt != typeHash.end();) {
-        QList<QQmlTypePrivate *> &list = const_cast<QList<QQmlTypePrivate *> &>(elementIt.value());
-
-        removeQQmlTypePrivate(list, type);
-
-#if 0
-        if (list.isEmpty())
-            elementIt = typeHash.erase(elementIt);
-        else
-            ++elementIt;
-#else
-        ++elementIt;
-#endif
-    }
-}
-
-QQmlType QQmlTypeModule::type(const QHashedStringRef &name, int minor) const
-{
-    QMutexLocker lock(metaTypeDataLock());
-
-    QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
-    if (types) {
-        for (int ii = 0; ii < types->count(); ++ii)
-            if (types->at(ii)->version_min <= minor)
-                return QQmlType(types->at(ii));
-    }
-
-    return QQmlType();
-}
-
-QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const
-{
-    QMutexLocker lock(metaTypeDataLock());
-
-    QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
-    if (types) {
-        for (int ii = 0; ii < types->count(); ++ii)
-            if (types->at(ii)->version_min <= minor)
-                return QQmlType(types->at(ii));
-    }
-
-    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(nullptr), m_minor(0)
-{
-}
-
-QQmlTypeModuleVersion::QQmlTypeModuleVersion(QQmlTypeModule *module, int minor)
-: m_module(module), m_minor(minor)
-{
-    Q_ASSERT(m_module);
-    Q_ASSERT(m_minor >= 0);
-}
-
-QQmlTypeModuleVersion::QQmlTypeModuleVersion(const QQmlTypeModuleVersion &o)
-: m_module(o.m_module), m_minor(o.m_minor)
-{
-}
-
-QQmlTypeModuleVersion &QQmlTypeModuleVersion::operator=(const QQmlTypeModuleVersion &o)
-{
-    m_module = o.m_module;
-    m_minor = o.m_minor;
-    return *this;
-}
-
-QQmlTypeModule *QQmlTypeModuleVersion::module() const
-{
-    return m_module;
-}
-
-int QQmlTypeModuleVersion::minorVersion() const
-{
-    return m_minor;
-}
-
-QQmlType QQmlTypeModuleVersion::type(const QHashedStringRef &name) const
-{
-    if (!m_module)
-        return QQmlType();
-    return m_module->type(name, m_minor);
-}
-
-QQmlType QQmlTypeModuleVersion::type(const QV4::String *name) const
-{
-    if (!m_module)
-        return QQmlType();
-    return m_module->type(name, m_minor);
-}
-
-void qmlClearTypeRegistrations() // Declared in qqml.h
+void QQmlMetaType::clearTypeRegistrations()
 {
     //Only cleans global static, assumed no running engine
     QMutexLocker lock(metaTypeDataLock());
@@ -1648,14 +140,9 @@ void qmlClearTypeRegistrations() // Declared in qqml.h
     data->metaObjectToType.clear();
     data->uriToModule.clear();
     data->undeletableTypes.clear();
-
-    QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types
-#if QT_CONFIG(library)
-    qmlClearEnginePlugins();
-#endif
 }
 
-static int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent)
+int QQmlMetaType::registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1665,16 +152,16 @@ static int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparen
     return data->parentFunctions.count() - 1;
 }
 
-QQmlType registerInterface(const QQmlPrivate::RegisterInterface &interface)
+QQmlType QQmlMetaType::registerInterface(const QQmlPrivate::RegisterInterface &type)
 {
-    if (interface.version > 0)
+    if (type.version > 0)
         qFatal("qmlRegisterType(): Cannot mix incompatible QML versions.");
 
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
 
-    QQmlType type(data, interface);
-    QQmlTypePrivate *priv = type.priv();
+    QQmlType dtype(data, type);
+    QQmlTypePrivate *priv = dtype.priv();
     Q_ASSERT(priv);
 
     data->idToType.insert(priv->typeId, priv);
@@ -1683,14 +170,14 @@ QQmlType registerInterface(const QQmlPrivate::RegisterInterface &interface)
     if (!priv->elementName.isEmpty())
         data->nameToType.insert(priv->elementName, priv);
 
-    if (data->interfaces.size() <= interface.typeId)
-        data->interfaces.resize(interface.typeId + 16);
-    if (data->lists.size() <= interface.listId)
-        data->lists.resize(interface.listId + 16);
-    data->interfaces.setBit(interface.typeId, true);
-    data->lists.setBit(interface.listId, true);
+    if (data->interfaces.size() <= type.typeId)
+        data->interfaces.resize(type.typeId + 16);
+    if (data->lists.size() <= type.listId)
+        data->lists.resize(type.listId + 16);
+    data->interfaces.setBit(type.typeId, true);
+    data->lists.setBit(type.listId, true);
 
-    return type;
+    return dtype;
 }
 
 QString registrationTypeString(QQmlType::RegistrationType typeType)
@@ -1708,7 +195,8 @@ QString registrationTypeString(QQmlType::RegistrationType typeType)
 }
 
 // NOTE: caller must hold a QMutexLocker on "data"
-bool checkRegistration(QQmlType::RegistrationType typeType, QQmlMetaTypeData *data, const char *uri, const QString &typeName, int majorVersion = -1)
+bool checkRegistration(QQmlType::RegistrationType typeType, QQmlMetaTypeData *data,
+                       const char *uri, const QString &typeName, int majorVersion = -1)
 {
     if (!typeName.isEmpty()) {
         if (typeName.at(0).isLower()) {
@@ -1803,7 +291,7 @@ void addTypeToData(QQmlTypePrivate *type, QQmlMetaTypeData *data)
     }
 }
 
-QQmlType registerType(const QQmlPrivate::RegisterType &type)
+QQmlType QQmlMetaType::registerType(const QQmlPrivate::RegisterType &type)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1820,7 +308,7 @@ QQmlType registerType(const QQmlPrivate::RegisterType &type)
     return dtype;
 }
 
-QQmlType registerSingletonType(const QQmlPrivate::RegisterSingletonType &type)
+QQmlType QQmlMetaType::registerSingletonType(const QQmlPrivate::RegisterSingletonType &type)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1919,7 +407,8 @@ void QQmlMetaType::unregisterInternalCompositeType(QV4::CompiledData::Compilatio
     QMetaType::unregisterType(lst_type);
 }
 
-int registerQmlUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &hookRegistration)
+int QQmlMetaType::registerUnitCacheHook(
+        const QQmlPrivate::RegisterQmlUnitCacheHook &hookRegistration)
 {
     if (hookRegistration.version > 0)
         qFatal("qmlRegisterType(): Cannot mix incompatible QML versions.");
@@ -1929,43 +418,7 @@ int registerQmlUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &hookRe
     return 0;
 }
 
-/*
-This method is "over generalized" to allow us to (potentially) register more types of things in
-the future without adding exported symbols.
-*/
-int QQmlPrivate::qmlregister(RegistrationType type, void *data)
-{
-    if (type == AutoParentRegistration)
-        return registerAutoParentFunction(*reinterpret_cast<RegisterAutoParent *>(data));
-    else if (type == QmlUnitCacheHookRegistration)
-        return registerQmlUnitCacheHook(*reinterpret_cast<RegisterQmlUnitCacheHook *>(data));
-
-    QQmlType dtype;
-    if (type == TypeRegistration)
-        dtype = registerType(*reinterpret_cast<RegisterType *>(data));
-    else if (type == InterfaceRegistration)
-        dtype = registerInterface(*reinterpret_cast<RegisterInterface *>(data));
-    else if (type == SingletonRegistration)
-        dtype = registerSingletonType(*reinterpret_cast<RegisterSingletonType *>(data));
-    else if (type == CompositeRegistration)
-        dtype = QQmlMetaType::registerCompositeType(*reinterpret_cast<RegisterCompositeType *>(data));
-    else if (type == CompositeSingletonRegistration)
-        dtype = QQmlMetaType::registerCompositeSingletonType(*reinterpret_cast<RegisterCompositeSingletonType *>(data));
-    else
-        return -1;
-
-    if (!dtype.isValid())
-        return -1;
-
-    QMutexLocker lock(metaTypeDataLock());
-    QQmlMetaTypeData *typeData = metaTypeData();
-    typeData->undeletableTypes.insert(dtype);
-
-    return dtype.index();
-}
-
-//From qqml.h
-bool qmlProtectModule(const char *uri, int majVersion)
+bool QQmlMetaType::protectModule(const char *uri, int majVersion)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1981,8 +434,7 @@ bool qmlProtectModule(const char *uri, int majVersion)
     return false;
 }
 
-//From qqml.h
-void qmlRegisterModule(const char *uri, int versionMajor, int versionMinor)
+void QQmlMetaType::registerModule(const char *uri, int versionMajor, int versionMinor)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1995,8 +447,7 @@ void qmlRegisterModule(const char *uri, int versionMajor, int versionMinor)
     p->maxMinorVersion = qMax(p->maxMinorVersion, versionMinor);
 }
 
-//From qqml.h
-int qmlTypeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+int QQmlMetaType::typeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -2012,6 +463,13 @@ int qmlTypeId(const char *uri, int versionMajor, int versionMinor, const char *q
     return type.index();
 }
 
+void QQmlMetaType::registerUndeletableType(const QQmlType &dtype)
+{
+    QMutexLocker lock(metaTypeDataLock());
+    QQmlMetaTypeData *typeData = metaTypeData();
+    typeData->undeletableTypes.insert(dtype);
+}
+
 bool QQmlMetaType::namespaceContainsRegistrations(const QString &uri, int majorVersion)
 {
     const QQmlMetaTypeData *data = metaTypeData();
@@ -2432,22 +890,6 @@ QQmlType QQmlMetaType::qmlType(const QUrl &unNormalizedUrl, bool includeNonFileI
         return QQmlType();
 }
 
-QQmlPropertyCache *QQmlMetaTypeData::propertyCache(const QMetaObject *metaObject)
-{
-    if (QQmlPropertyCache *rv = propertyCaches.value(metaObject))
-        return rv;
-
-    if (!metaObject->superClass()) {
-        QQmlPropertyCache *rv = new QQmlPropertyCache(metaObject);
-        propertyCaches.insert(metaObject, rv);
-        return rv;
-    }
-    QQmlPropertyCache *super = propertyCache(metaObject->superClass());
-    QQmlPropertyCache *rv = super->copyAndAppend(metaObject);
-    propertyCaches.insert(metaObject, rv);
-    return rv;
-}
-
 QQmlPropertyCache *QQmlMetaType::propertyCache(const QMetaObject *metaObject)
 {
     QMutexLocker lock(metaTypeDataLock());
@@ -2455,111 +897,6 @@ QQmlPropertyCache *QQmlMetaType::propertyCache(const QMetaObject *metaObject)
     return data->propertyCache(metaObject);
 }
 
-QQmlPropertyCache *QQmlMetaTypeData::propertyCache(const QQmlType &type, int minorVersion)
-{
-    Q_ASSERT(type.isValid());
-
-    if (QQmlPropertyCache *pc = type.key()->propertyCacheForMinorVersion(minorVersion))
-        return pc;
-
-    QVector<QQmlType> types;
-
-    int maxMinorVersion = 0;
-
-    const QMetaObject *metaObject = type.metaObject();
-
-    while (metaObject) {
-        QQmlType t = QQmlMetaType::qmlType(metaObject, type.module(), type.majorVersion(), minorVersion);
-        if (t.isValid()) {
-            maxMinorVersion = qMax(maxMinorVersion, t.minorVersion());
-            types << t;
-        } else {
-            types << QQmlType();
-        }
-
-        metaObject = metaObject->superClass();
-    }
-
-    if (QQmlPropertyCache *pc = type.key()->propertyCacheForMinorVersion(maxMinorVersion)) {
-        const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(minorVersion, pc);
-        return pc;
-    }
-
-    QQmlPropertyCache *raw = propertyCache(type.metaObject());
-
-    bool hasCopied = false;
-
-    for (int ii = 0; ii < types.count(); ++ii) {
-        QQmlType currentType = types.at(ii);
-        if (!currentType.isValid())
-            continue;
-
-        int rev = currentType.metaObjectRevision();
-        int moIndex = types.count() - 1 - ii;
-
-        if (raw->allowedRevisionCache[moIndex] != rev) {
-            if (!hasCopied) {
-                raw = raw->copy();
-                hasCopied = true;
-            }
-            raw->allowedRevisionCache[moIndex] = rev;
-        }
-    }
-
-    // Test revision compatibility - the basic rule is:
-    //    * Anything that is excluded, cannot overload something that is not excluded *
-
-    // Signals override:
-    //    * other signals and methods of the same name.
-    //    * properties named on<Signal Name>
-    //    * automatic <property name>Changed notify signals
-
-    // Methods override:
-    //    * other methods of the same name
-
-    // Properties override:
-    //    * other elements of the same name
-
-#if 0
-    bool overloadError = false;
-    QString overloadName;
-
-    for (QQmlPropertyCache::StringCache::ConstIterator iter = raw->stringCache.begin();
-         !overloadError && iter != raw->stringCache.end();
-         ++iter) {
-
-        QQmlPropertyData *d = *iter;
-        if (raw->isAllowedInRevision(d))
-            continue; // Not excluded - no problems
-
-        // check that a regular "name" overload isn't happening
-        QQmlPropertyData *current = d;
-        while (!overloadError && current) {
-            current = d->overrideData(current);
-            if (current && raw->isAllowedInRevision(current))
-                overloadError = true;
-        }
-    }
-
-    if (overloadError) {
-        if (hasCopied) raw->release();
-
-        error.setDescription(QLatin1String("Type ") + type.qmlTypeName() + QLatin1Char(' ') + QString::number(type.majorVersion()) + QLatin1Char('.') + QString::number(minorVersion) + QLatin1String(" contains an illegal property \"") + overloadName + QLatin1String("\".  This is an error in the type's implementation."));
-        return 0;
-    }
-#endif
-
-    const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(minorVersion, raw);
-
-    if (hasCopied)
-        raw->release();
-
-    if (minorVersion != maxMinorVersion)
-        const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(maxMinorVersion, raw);
-
-    return raw;
-}
-
 QQmlPropertyCache *QQmlMetaType::propertyCache(const QQmlType &type, int minorVersion)
 {
     QMutexLocker lock(metaTypeDataLock());
@@ -2567,7 +904,7 @@ QQmlPropertyCache *QQmlMetaType::propertyCache(const QQmlType &type, int minorVe
     return data->propertyCache(type, minorVersion);
 }
 
-void qmlUnregisterType(int typeIndex)
+void QQmlMetaType::unregisterType(int typeIndex)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -2788,4 +1125,46 @@ QString QQmlMetaType::prettyTypeName(const QObject *object)
     return typeName;
 }
 
+void QQmlMetaType::startRecordingTypeRegFailures(QStringList *failures)
+{
+    metaTypeData()->startRecordingTypeRegFailures(failures);
+}
+
+void QQmlMetaType::stopRecordingTypeRegFailures()
+{
+    metaTypeData()->stopRecordingTypeRegFailures();
+}
+
+QList<QQmlProxyMetaObject::ProxyData> QQmlMetaType::proxyData(const QMetaObject *mo,
+                                                              const QMetaObject *baseMetaObject,
+                                                              QMetaObject *lastMetaObject)
+{
+    QList<QQmlProxyMetaObject::ProxyData> metaObjects;
+    mo = mo->d.superdata;
+
+    while (mo) {
+        QQmlTypePrivate *t = metaTypeData()->metaObjectToType.value(mo);
+        if (t) {
+            if (t->regType == QQmlType::CppType) {
+                if (t->extraData.cd->extFunc) {
+                    QMetaObjectBuilder builder;
+                    clone(builder, t->extraData.cd->extMetaObject, t->baseMetaObject, baseMetaObject);
+                    builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
+                    QMetaObject *mmo = builder.toMetaObject();
+                    mmo->d.superdata = baseMetaObject;
+                    if (!metaObjects.isEmpty())
+                        metaObjects.constLast().metaObject->d.superdata = mmo;
+                    else if (lastMetaObject)
+                        lastMetaObject->d.superdata = mmo;
+                    QQmlProxyMetaObject::ProxyData data = { mmo, t->extraData.cd->extFunc, 0, 0 };
+                    metaObjects << data;
+                }
+            }
+        }
+        mo = mo->d.superdata;
+    }
+
+    return metaObjects;
+}
+
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index b04b7371a1..5ba13ff4ee 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -51,41 +51,36 @@
 // We mean it.
 //
 
-#include "qqml.h"
 #include <private/qtqmlglobal_p.h>
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qbitarray.h>
-#include <QtQml/qjsvalue.h>
+#include <private/qqmltype_p.h>
+#include <private/qqmlproxymetaobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlType;
-class QQmlEngine;
-class QQmlEnginePrivate;
-class QQmlCustomParser;
-class QQmlTypePrivate;
 class QQmlTypeModule;
-class QHashedString;
-class QHashedStringRef;
 class QMutex;
-class QQmlPropertyCache;
-class QQmlCompiledData;
-
-namespace QV4 { struct String; }
-
-void Q_QML_PRIVATE_EXPORT qmlUnregisterType(int type);
 
 class Q_QML_PRIVATE_EXPORT QQmlMetaType
 {
 public:
+    static QQmlType registerType(const QQmlPrivate::RegisterType &type);
+    static QQmlType registerInterface(const QQmlPrivate::RegisterInterface &type);
+    static QQmlType registerSingletonType(const QQmlPrivate::RegisterSingletonType &type);
     static QQmlType registerCompositeSingletonType(const QQmlPrivate::RegisterCompositeSingletonType &type);
     static QQmlType registerCompositeType(const QQmlPrivate::RegisterCompositeType &type);
 
+    static void unregisterType(int type);
+
     static void registerInternalCompositeType(QV4::CompiledData::CompilationUnit *compilationUnit);
     static void unregisterInternalCompositeType(QV4::CompiledData::CompilationUnit *compilationUnit);
 
+    static void registerModule(const char *uri, int versionMajor, int versionMinor);
+    static bool protectModule(const char *uri, int majVersion);
+
+    static int typeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName);
+
+    static void registerUndeletableType(const QQmlType &dtype);
+
     static QList<QString> qmlTypeNames();
     static QList<QQmlType> qmlTypes();
     static QList<QQmlType> qmlSingletonTypes();
@@ -159,218 +154,36 @@ public:
     static QMutex *typeRegistrationLock();
 
     static QString prettyTypeName(const QObject *object);
-};
 
-struct QQmlMetaTypeData;
-class QHashedCStringRef;
-class Q_QML_PRIVATE_EXPORT QQmlType
-{
-public:
-    QQmlType();
-    QQmlType(const QQmlType &other);
-    QQmlType &operator =(const QQmlType &other);
-    explicit QQmlType(QQmlTypePrivate *priv);
-    ~QQmlType();
-
-    bool operator ==(const QQmlType &other) const {
-        return d == other.d;
+    template <typename QQmlTypeContainer>
+    static void removeQQmlTypePrivate(QQmlTypeContainer &container,
+                                      const QQmlTypePrivate *reference)
+    {
+        for (typename QQmlTypeContainer::iterator it = container.begin(); it != container.end();) {
+            if (*it == reference)
+                it = container.erase(it);
+            else
+                ++it;
+        }
     }
 
-    bool isValid() const { return d != nullptr; }
-    const QQmlTypePrivate *key() const { return d; }
-
-    QByteArray typeName() const;
-    QString qmlTypeName() const;
-    QString elementName() const;
-
-    QHashedString module() const;
-    int majorVersion() const;
-    int minorVersion() const;
+    static int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent);
+    static int registerUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &hookRegistration);
+    static void clearTypeRegistrations();
 
-    bool availableInVersion(int vmajor, int vminor) const;
-    bool availableInVersion(const QHashedStringRef &module, int vmajor, int vminor) const;
+    static void startRecordingTypeRegFailures(QStringList *failures);
+    static void stopRecordingTypeRegFailures();
 
-    QObject *create() const;
-    void create(QObject **, void **, size_t) const;
-
-    typedef void (*CreateFunc)(void *);
-    CreateFunc createFunction() const;
-    QQmlCustomParser *customParser() const;
-
-    bool isCreatable() const;
-    typedef QObject *(*ExtensionFunc)(QObject *);
-    ExtensionFunc extensionFunction() const;
-    bool isExtendedType() const;
-    QString noCreationReason() const;
-
-    bool isSingleton() const;
-    bool isInterface() const;
-    bool isComposite() const;
-    bool isCompositeSingleton() const;
-
-    int typeId() const;
-    int qListTypeId() const;
-
-    const QMetaObject *metaObject() const;
-    const QMetaObject *baseMetaObject() const;
-    int metaObjectRevision() const;
-    bool containsRevisionedAttributes() const;
-
-    QQmlAttachedPropertiesFunc attachedPropertiesFunction(QQmlEnginePrivate *engine) const;
-    const QMetaObject *attachedPropertiesType(QQmlEnginePrivate *engine) const;
-    int attachedPropertiesId(QQmlEnginePrivate *engine) const;
-
-    int parserStatusCast() const;
-    const char *interfaceIId() const;
-    int propertyValueSourceCast() const;
-    int propertyValueInterceptorCast() const;
-
-    int index() const;
-
-    class Q_QML_PRIVATE_EXPORT SingletonInstanceInfo
-    {
-    public:
-        SingletonInstanceInfo()
-            : scriptCallback(nullptr), qobjectCallback(nullptr), instanceMetaObject(nullptr) {}
-
-        QJSValue (*scriptCallback)(QQmlEngine *, QJSEngine *);
-        QObject *(*qobjectCallback)(QQmlEngine *, QJSEngine *);
-        const QMetaObject *instanceMetaObject;
-        QString typeName;
-        QUrl url; // used by composite singletons
-
-        void setQObjectApi(QQmlEngine *, QObject *);
-        QObject *qobjectApi(QQmlEngine *) const;
-        void setScriptApi(QQmlEngine *, const QJSValue &);
-        QJSValue scriptApi(QQmlEngine *) const;
-
-        void init(QQmlEngine *);
-        void destroy(QQmlEngine *);
-
-        QHash<QQmlEngine *, QJSValue> scriptApis;
-        QHash<QQmlEngine *, QObject *> qobjectApis;
-    };
-    SingletonInstanceInfo *singletonInstanceInfo() const;
-
-    QUrl sourceUrl() const;
-
-    int enumValue(QQmlEnginePrivate *engine, const QHashedStringRef &, bool *ok) const;
-    int enumValue(QQmlEnginePrivate *engine, const QHashedCStringRef &, bool *ok) const;
-    int enumValue(QQmlEnginePrivate *engine, const QV4::String *, bool *ok) const;
-
-    int scopedEnumIndex(QQmlEnginePrivate *engine, const QV4::String *, bool *ok) const;
-    int scopedEnumIndex(QQmlEnginePrivate *engine, const QString &, bool *ok) const;
-    int scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *, bool *ok) const;
-    int scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &, bool *ok) const;
-    int scopedEnumValue(QQmlEnginePrivate *engine, const QByteArray &, const QByteArray &, bool *ok) const;
-    int scopedEnumValue(QQmlEnginePrivate *engine, const QStringRef &, const QStringRef &, bool *ok) const;
-
-    QQmlTypePrivate *priv() const { return d; }
-    static void refHandle(QQmlTypePrivate *priv);
-    static void derefHandle(QQmlTypePrivate *priv);
-    static int refCount(QQmlTypePrivate *priv);
-
-    enum RegistrationType {
-        CppType = 0,
-        SingletonType = 1,
-        InterfaceType = 2,
-        CompositeType = 3,
-        CompositeSingletonType = 4,
-        AnyRegistrationType = 255
-    };
+    static QList<QQmlProxyMetaObject::ProxyData> proxyData(const QMetaObject *mo,
+                                                           const QMetaObject *baseMetaObject,
+                                                           QMetaObject *lastMetaObject);
 
-private:
-    QQmlType superType() const;
-    QQmlType resolveCompositeBaseType(QQmlEnginePrivate *engine) const;
-    int resolveCompositeEnumValue(QQmlEnginePrivate *engine, const QString &name, bool *ok) const;
-    QQmlPropertyCache *compositePropertyCache(QQmlEnginePrivate *engine) const;
-    friend class QQmlTypePrivate;
-
-    friend QString registrationTypeString(RegistrationType);
-    friend bool checkRegistration(RegistrationType, QQmlMetaTypeData *, const char *, const QString &, int);
-    friend QQmlType registerType(const QQmlPrivate::RegisterType &);
-    friend QQmlType registerSingletonType(const QQmlPrivate::RegisterSingletonType &);
-    friend QQmlType registerInterface(const QQmlPrivate::RegisterInterface &);
-    friend int registerQmlUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &);
-    friend uint qHash(const QQmlType &t, uint seed);
-    friend Q_QML_EXPORT void qmlClearTypeRegistrations();
-    friend class QQmlMetaType;
-
-    QQmlType(QQmlMetaTypeData *data, const QQmlPrivate::RegisterInterface &);
-    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterSingletonType &);
-    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterType &);
-    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterCompositeType &);
-    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterCompositeSingletonType &);
-
-    QQmlTypePrivate *d;
+    static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
+                      const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd);
 };
 
 Q_DECLARE_TYPEINFO(QQmlMetaType, Q_MOVABLE_TYPE);
 
-
-inline uint qHash(const QQmlType &t, uint seed = 0) { return qHash(reinterpret_cast<quintptr>(t.d), seed); }
-
-
-class QQmlTypeModulePrivate;
-class QQmlTypeModule
-{
-public:
-    QString module() const;
-    int majorVersion() const;
-
-    int minimumMinorVersion() const;
-    int maximumMinorVersion() const;
-
-    QQmlType type(const QHashedStringRef &, int) const;
-    QQmlType type(const QV4::String *, int) const;
-
-    void walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const;
-
-    QQmlTypeModulePrivate *priv() { return d; }
-private:
-    //Used by register functions and creates the QQmlTypeModule for them
-    friend QQmlTypeModule *getTypeModule(const QHashedString &uri, int majorVersion, QQmlMetaTypeData *data);
-    friend void addTypeToData(QQmlTypePrivate *type, QQmlMetaTypeData *data);
-    friend struct QQmlMetaTypeData;
-    friend Q_QML_EXPORT void qmlClearTypeRegistrations();
-    friend class QQmlTypeModulePrivate;
-
-    QQmlTypeModule();
-    ~QQmlTypeModule();
-    QQmlTypeModulePrivate *d;
-};
-
-class QQmlTypeModuleVersion
-{
-public:
-    QQmlTypeModuleVersion();
-    QQmlTypeModuleVersion(QQmlTypeModule *, int);
-    QQmlTypeModuleVersion(const QQmlTypeModuleVersion &);
-    QQmlTypeModuleVersion &operator=(const QQmlTypeModuleVersion &);
-
-    QQmlTypeModule *module() const;
-    int minorVersion() const;
-
-    QQmlType type(const QHashedStringRef &) const;
-    QQmlType type(const QV4::String *) const;
-
-private:
-    QQmlTypeModule *m_module;
-    int m_minor;
-};
-
-class Q_AUTOTEST_EXPORT QQmlMetaTypeRegistrationFailureRecorder
-{
-    QStringList _failures;
-
-public:
-    QQmlMetaTypeRegistrationFailureRecorder();
-    ~QQmlMetaTypeRegistrationFailureRecorder();
-
-    QStringList failures() const
-    { return _failures; }
-};
-
 QT_END_NAMESPACE
 
 #endif // QQMLMETATYPE_P_H
diff --git a/src/qml/qml/qqmlmetatypedata.cpp b/src/qml/qml/qqmlmetatypedata.cpp
new file mode 100644
index 0000000000..c5b9ae1a15
--- /dev/null
+++ b/src/qml/qml/qqmlmetatypedata.cpp
@@ -0,0 +1,195 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmlmetatypedata_p.h"
+
+#include <private/qqmltype_p_p.h>
+#include <private/qqmltypemodule_p.h>
+#include <private/qqmlpropertycache_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlMetaTypeData::QQmlMetaTypeData()
+{
+}
+
+QQmlMetaTypeData::~QQmlMetaTypeData()
+{
+    for (TypeModules::const_iterator i = uriToModule.constBegin(), cend = uriToModule.constEnd(); i != cend; ++i)
+        delete *i;
+    for (QHash<const QMetaObject *, QQmlPropertyCache *>::Iterator it = propertyCaches.begin(), end = propertyCaches.end();
+         it != end; ++it)
+        (*it)->release();
+}
+
+void QQmlMetaTypeData::registerType(QQmlTypePrivate *priv)
+{
+    for (int i = 0; i < types.count(); ++i) {
+        if (!types.at(i).isValid()) {
+            types[i] = QQmlType(priv);
+            priv->index = i;
+            return;
+        }
+    }
+    types.append(QQmlType(priv));
+    priv->index = types.count() - 1;
+}
+
+QQmlPropertyCache *QQmlMetaTypeData::propertyCache(const QMetaObject *metaObject)
+{
+    if (QQmlPropertyCache *rv = propertyCaches.value(metaObject))
+        return rv;
+
+    if (!metaObject->superClass()) {
+        QQmlPropertyCache *rv = new QQmlPropertyCache(metaObject);
+        propertyCaches.insert(metaObject, rv);
+        return rv;
+    }
+    QQmlPropertyCache *super = propertyCache(metaObject->superClass());
+    QQmlPropertyCache *rv = super->copyAndAppend(metaObject);
+    propertyCaches.insert(metaObject, rv);
+    return rv;
+}
+
+QQmlPropertyCache *QQmlMetaTypeData::propertyCache(const QQmlType &type, int minorVersion)
+{
+    Q_ASSERT(type.isValid());
+
+    if (QQmlPropertyCache *pc = type.key()->propertyCacheForMinorVersion(minorVersion))
+        return pc;
+
+    QVector<QQmlType> types;
+
+    int maxMinorVersion = 0;
+
+    const QMetaObject *metaObject = type.metaObject();
+
+    while (metaObject) {
+        QQmlType t = QQmlMetaType::qmlType(metaObject, type.module(), type.majorVersion(), minorVersion);
+        if (t.isValid()) {
+            maxMinorVersion = qMax(maxMinorVersion, t.minorVersion());
+            types << t;
+        } else {
+            types << QQmlType();
+        }
+
+        metaObject = metaObject->superClass();
+    }
+
+    if (QQmlPropertyCache *pc = type.key()->propertyCacheForMinorVersion(maxMinorVersion)) {
+        const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(minorVersion, pc);
+        return pc;
+    }
+
+    QQmlPropertyCache *raw = propertyCache(type.metaObject());
+
+    bool hasCopied = false;
+
+    for (int ii = 0; ii < types.count(); ++ii) {
+        QQmlType currentType = types.at(ii);
+        if (!currentType.isValid())
+            continue;
+
+        int rev = currentType.metaObjectRevision();
+        int moIndex = types.count() - 1 - ii;
+
+        if (raw->allowedRevisionCache[moIndex] != rev) {
+            if (!hasCopied) {
+                raw = raw->copy();
+                hasCopied = true;
+            }
+            raw->allowedRevisionCache[moIndex] = rev;
+        }
+    }
+
+    // Test revision compatibility - the basic rule is:
+    //    * Anything that is excluded, cannot overload something that is not excluded *
+
+    // Signals override:
+    //    * other signals and methods of the same name.
+    //    * properties named on<Signal Name>
+    //    * automatic <property name>Changed notify signals
+
+    // Methods override:
+    //    * other methods of the same name
+
+    // Properties override:
+    //    * other elements of the same name
+
+#if 0
+    bool overloadError = false;
+    QString overloadName;
+
+    for (QQmlPropertyCache::StringCache::ConstIterator iter = raw->stringCache.begin();
+         !overloadError && iter != raw->stringCache.end();
+         ++iter) {
+
+        QQmlPropertyData *d = *iter;
+        if (raw->isAllowedInRevision(d))
+            continue; // Not excluded - no problems
+
+        // check that a regular "name" overload isn't happening
+        QQmlPropertyData *current = d;
+        while (!overloadError && current) {
+            current = d->overrideData(current);
+            if (current && raw->isAllowedInRevision(current))
+                overloadError = true;
+        }
+    }
+
+    if (overloadError) {
+        if (hasCopied) raw->release();
+
+        error.setDescription(QLatin1String("Type ") + type.qmlTypeName() + QLatin1Char(' ') + QString::number(type.majorVersion()) + QLatin1Char('.') + QString::number(minorVersion) + QLatin1String(" contains an illegal property \"") + overloadName + QLatin1String("\".  This is an error in the type's implementation."));
+        return 0;
+    }
+#endif
+
+    const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(minorVersion, raw);
+
+    if (hasCopied)
+        raw->release();
+
+    if (minorVersion != maxMinorVersion)
+        const_cast<QQmlTypePrivate*>(type.key())->setPropertyCacheForMinorVersion(maxMinorVersion, raw);
+
+    return raw;
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlmetatypedata_p.h b/src/qml/qml/qqmlmetatypedata_p.h
new file mode 100644
index 0000000000..17409ed51d
--- /dev/null
+++ b/src/qml/qml/qqmlmetatypedata_p.h
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLMETATYPEDATA_P_H
+#define QQMLMETATYPEDATA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qqmltype_p.h>
+#include <private/qqmlmetatype_p.h>
+#include <private/qhashedstring_p.h>
+
+#include <QtCore/qset.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qbitarray.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlTypePrivate;
+struct QQmlMetaTypeData
+{
+    QQmlMetaTypeData();
+    ~QQmlMetaTypeData();
+    void registerType(QQmlTypePrivate *priv);
+    QList<QQmlType> types;
+    QSet<QQmlType> undeletableTypes;
+    typedef QHash<int, QQmlTypePrivate *> Ids;
+    Ids idToType;
+    typedef QHash<QHashedStringRef, QQmlTypePrivate *> Names;
+    Names nameToType;
+    typedef QHash<QUrl, QQmlTypePrivate *> Files; //For file imported composite types only
+    Files urlToType;
+    Files urlToNonFileImportType; // For non-file imported composite and composite
+            // singleton types. This way we can locate any
+            // of them by url, even if it was registered as
+            // a module via QQmlPrivate::RegisterCompositeType
+    typedef QHash<const QMetaObject *, QQmlTypePrivate *> MetaObjects;
+    MetaObjects metaObjectToType;
+    typedef QHash<int, QQmlMetaType::StringConverter> StringConverters;
+    StringConverters stringConverters;
+
+    struct VersionedUri {
+        VersionedUri()
+            : majorVersion(0) {}
+        VersionedUri(const QHashedString &uri, int majorVersion)
+            : uri(uri), majorVersion(majorVersion) {}
+        bool operator==(const VersionedUri &other) const {
+            return other.majorVersion == majorVersion && other.uri == uri;
+        }
+        QHashedString uri;
+        int majorVersion;
+    };
+    typedef QHash<VersionedUri, QQmlTypeModule *> TypeModules;
+    TypeModules uriToModule;
+
+    QBitArray objects;
+    QBitArray interfaces;
+    QBitArray lists;
+
+    QList<QQmlPrivate::AutoParentFunction> parentFunctions;
+    QVector<QQmlPrivate::QmlUnitCacheLookupFunction> lookupCachedQmlUnit;
+
+    QSet<QString> protectedNamespaces;
+
+    QString typeRegistrationNamespace;
+
+    QHash<int, int> qmlLists;
+
+    QHash<const QMetaObject *, QQmlPropertyCache *> propertyCaches;
+    QQmlPropertyCache *propertyCache(const QMetaObject *metaObject);
+    QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion);
+
+    void startRecordingTypeRegFailures(QStringList *storage)
+    { typeRegistrationFailures = storage; }
+    void stopRecordingTypeRegFailures()
+    { startRecordingTypeRegFailures(nullptr); }
+    void recordTypeRegFailure(const QString &message)
+    {
+        if (typeRegistrationFailures)
+            typeRegistrationFailures->append(message);
+        else
+            qWarning("%s", message.toUtf8().constData());
+    }
+
+private:
+    QStringList *typeRegistrationFailures = nullptr;
+};
+
+inline uint qHash(const QQmlMetaTypeData::VersionedUri &v)
+{
+    return v.uri.hash() ^ qHash(v.majorVersion);
+}
+
+QT_END_NAMESPACE
+
+#endif // QQMLMETATYPEDATA_P_H
diff --git a/src/qml/qml/qqmlmetatyperegistrationfailurerecorder.cpp b/src/qml/qml/qqmlmetatyperegistrationfailurerecorder.cpp
new file mode 100644
index 0000000000..ed11891863
--- /dev/null
+++ b/src/qml/qml/qqmlmetatyperegistrationfailurerecorder.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmlmetatyperegistrationfailurerecorder_p.h"
+
+#include <private/qqmlmetatype_p.h>
+#include <private/qqmlmetatypedata_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlMetaTypeRegistrationFailureRecorder::QQmlMetaTypeRegistrationFailureRecorder()
+{
+    QQmlMetaType::startRecordingTypeRegFailures(&_failures);
+}
+
+QQmlMetaTypeRegistrationFailureRecorder::~QQmlMetaTypeRegistrationFailureRecorder()
+{
+    QQmlMetaType::stopRecordingTypeRegFailures();
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlmetatyperegistrationfailurerecorder_p.h b/src/qml/qml/qqmlmetatyperegistrationfailurerecorder_p.h
new file mode 100644
index 0000000000..a5cfdeaa60
--- /dev/null
+++ b/src/qml/qml/qqmlmetatyperegistrationfailurerecorder_p.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLMETATYPEREGISTRATIONFAILURERECORDER_P_H
+#define QQMLMETATYPEREGISTRATIONFAILURERECORDER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_AUTOTEST_EXPORT QQmlMetaTypeRegistrationFailureRecorder
+{
+    QStringList _failures;
+
+public:
+    QQmlMetaTypeRegistrationFailureRecorder();
+    ~QQmlMetaTypeRegistrationFailureRecorder();
+
+    QStringList failures() const
+    { return _failures; }
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLMETATYPEREGISTRATIONFAILURERECORDER_P_H
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp
new file mode 100644
index 0000000000..1c69cedcd6
--- /dev/null
+++ b/src/qml/qml/qqmltype.cpp
@@ -0,0 +1,1129 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmltype_p_p.h"
+
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlcomponent.h>
+
+#include <private/qqmlcustomparser_p.h>
+#include <private/qqmldata_p.h>
+#include <private/qqmlmetatypedata_p.h>
+#include <private/qqmlpropertycache_p.h>
+
+QT_BEGIN_NAMESPACE
+
+void QQmlType::SingletonInstanceInfo::init(QQmlEngine *e)
+{
+    if (scriptCallback && scriptApi(e).isUndefined()) {
+        QJSValue value = scriptCallback(e, e);
+        if (value.isQObject()) {
+            QObject *o = value.toQObject();
+            // even though the object is defined in C++, qmlContext(obj) and qmlEngine(obj)
+            // should behave identically to QML singleton types.
+            e->setContextForObject(o, new QQmlContext(e->rootContext(), e));
+        }
+        setScriptApi(e, value);
+    } else if (qobjectCallback && !qobjectApi(e)) {
+        QObject *o = qobjectCallback(e, e);
+        setQObjectApi(e, o);
+        if (!o) {
+            qFatal("qmlRegisterSingletonType(): \"%s\" is not available because the callback function returns a null pointer.", qPrintable(typeName));
+        }
+        // if this object can use a property cache, create it now
+        QQmlData::ensurePropertyCache(e, o);
+        // even though the object is defined in C++, qmlContext(obj) and qmlEngine(obj)
+        // should behave identically to QML singleton types.
+        e->setContextForObject(o, new QQmlContext(e->rootContext(), e));
+    } else if (!url.isEmpty() && !qobjectApi(e)) {
+        QQmlComponent component(e, url, QQmlComponent::PreferSynchronous);
+        QObject *o = component.beginCreate(e->rootContext());
+        setQObjectApi(e, o);
+        if (o)
+            component.completeCreate();
+    }
+}
+
+void QQmlType::SingletonInstanceInfo::destroy(QQmlEngine *e)
+{
+    // cleans up the engine-specific singleton instances if they exist.
+    scriptApis.remove(e);
+    QObject *o = qobjectApis.take(e);
+    if (o) {
+        QQmlData *ddata = QQmlData::get(o, false);
+        if (url.isEmpty() && ddata && ddata->indestructible && ddata->explicitIndestructibleSet)
+            return;
+        delete o;
+    }
+}
+
+void QQmlType::SingletonInstanceInfo::setQObjectApi(QQmlEngine *e, QObject *o)
+{
+    qobjectApis.insert(e, o);
+}
+
+QObject *QQmlType::SingletonInstanceInfo::qobjectApi(QQmlEngine *e) const
+{
+    return qobjectApis.value(e);
+}
+
+void QQmlType::SingletonInstanceInfo::setScriptApi(QQmlEngine *e, const QJSValue &v)
+{
+    scriptApis.insert(e, v);
+}
+
+QJSValue QQmlType::SingletonInstanceInfo::scriptApi(QQmlEngine *e) const
+{
+    return scriptApis.value(e);
+}
+
+QHash<const QMetaObject *, int> QQmlTypePrivate::attachedPropertyIds;
+
+QQmlTypePrivate::QQmlTypePrivate(QQmlType::RegistrationType type)
+    : refCount(1), regType(type), iid(nullptr), typeId(0), listId(0), revision(0),
+    containsRevisionedAttributes(false), baseMetaObject(nullptr),
+    index(-1), isSetup(false), isEnumSetup(false), haveSuperType(false)
+{
+    switch (type) {
+    case QQmlType::CppType:
+        extraData.cd = new QQmlCppTypeData;
+        extraData.cd->allocationSize = 0;
+        extraData.cd->newFunc = nullptr;
+        extraData.cd->parserStatusCast = -1;
+        extraData.cd->extFunc = nullptr;
+        extraData.cd->extMetaObject = nullptr;
+        extraData.cd->customParser = nullptr;
+        extraData.cd->attachedPropertiesFunc = nullptr;
+        extraData.cd->attachedPropertiesType = nullptr;
+        extraData.cd->propertyValueSourceCast = -1;
+        extraData.cd->propertyValueInterceptorCast = -1;
+        extraData.cd->registerEnumClassesUnscoped = true;
+        break;
+    case QQmlType::SingletonType:
+    case QQmlType::CompositeSingletonType:
+        extraData.sd = new QQmlSingletonTypeData;
+        extraData.sd->singletonInstanceInfo = nullptr;
+        break;
+    case QQmlType::InterfaceType:
+        extraData.cd = nullptr;
+        break;
+    case QQmlType::CompositeType:
+        extraData.fd = new QQmlCompositeTypeData;
+        break;
+    default: qFatal("QQmlTypePrivate Internal Error.");
+    }
+}
+
+QQmlTypePrivate::~QQmlTypePrivate()
+{
+    qDeleteAll(scopedEnums);
+    switch (regType) {
+    case QQmlType::CppType:
+        delete extraData.cd->customParser;
+        delete extraData.cd;
+        break;
+    case QQmlType::SingletonType:
+    case QQmlType::CompositeSingletonType:
+        delete extraData.sd->singletonInstanceInfo;
+        delete extraData.sd;
+        break;
+    case QQmlType::CompositeType:
+        delete extraData.fd;
+        break;
+    default: //Also InterfaceType, because it has no extra data
+        break;
+    }
+}
+
+QQmlType::QQmlType(QQmlMetaTypeData *data, const QQmlPrivate::RegisterInterface &interface)
+    : d(new QQmlTypePrivate(InterfaceType))
+{
+    d->iid = interface.iid;
+    d->typeId = interface.typeId;
+    d->listId = interface.listId;
+    d->isSetup = true;
+    d->version_maj = 0;
+    d->version_min = 0;
+    data->registerType(d);
+}
+
+QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterSingletonType &type)
+    : d(new QQmlTypePrivate(SingletonType))
+{
+    data->registerType(d);
+
+    d->elementName = elementName;
+    d->module = QString::fromUtf8(type.uri);
+
+    d->version_maj = type.versionMajor;
+    d->version_min = type.versionMinor;
+
+    if (type.qobjectApi) {
+        if (type.version >= 1) // static metaobject added in version 1
+            d->baseMetaObject = type.instanceMetaObject;
+        if (type.version >= 2) // typeId added in version 2
+            d->typeId = type.typeId;
+        if (type.version >= 2) // revisions added in version 2
+            d->revision = type.revision;
+    }
+
+    d->extraData.sd->singletonInstanceInfo = new SingletonInstanceInfo;
+    d->extraData.sd->singletonInstanceInfo->scriptCallback = type.scriptApi;
+    d->extraData.sd->singletonInstanceInfo->qobjectCallback = type.qobjectApi;
+    d->extraData.sd->singletonInstanceInfo->typeName = QString::fromUtf8(type.typeName);
+    d->extraData.sd->singletonInstanceInfo->instanceMetaObject
+            = (type.qobjectApi && type.version >= 1) ? type.instanceMetaObject : nullptr;
+}
+
+QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterCompositeSingletonType &type)
+    : d(new QQmlTypePrivate(CompositeSingletonType))
+{
+    data->registerType(d);
+
+    d->elementName = elementName;
+    d->module = QString::fromUtf8(type.uri);
+
+    d->version_maj = type.versionMajor;
+    d->version_min = type.versionMinor;
+
+    d->extraData.sd->singletonInstanceInfo = new SingletonInstanceInfo;
+    d->extraData.sd->singletonInstanceInfo->url = QQmlTypeLoader::normalize(type.url);
+    d->extraData.sd->singletonInstanceInfo->typeName = QString::fromUtf8(type.typeName);
+}
+
+QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterType &type)
+    : d(new QQmlTypePrivate(CppType))
+{
+    data->registerType(d);
+
+    d->elementName = elementName;
+    d->module = QString::fromUtf8(type.uri);
+
+    d->version_maj = type.versionMajor;
+    d->version_min = type.versionMinor;
+    if (type.version >= 1) // revisions added in version 1
+        d->revision = type.revision;
+    d->typeId = type.typeId;
+    d->listId = type.listId;
+    d->extraData.cd->allocationSize = type.objectSize;
+    d->extraData.cd->newFunc = type.create;
+    d->extraData.cd->noCreationReason = type.noCreationReason;
+    d->baseMetaObject = type.metaObject;
+    d->extraData.cd->attachedPropertiesFunc = type.attachedPropertiesFunction;
+    d->extraData.cd->attachedPropertiesType = type.attachedPropertiesMetaObject;
+    if (d->extraData.cd->attachedPropertiesType) {
+        auto iter = QQmlTypePrivate::attachedPropertyIds.find(d->baseMetaObject);
+        if (iter == QQmlTypePrivate::attachedPropertyIds.end())
+            iter = QQmlTypePrivate::attachedPropertyIds.insert(d->baseMetaObject, d->index);
+        d->extraData.cd->attachedPropertiesId = *iter;
+    } else {
+        d->extraData.cd->attachedPropertiesId = -1;
+    }
+    d->extraData.cd->parserStatusCast = type.parserStatusCast;
+    d->extraData.cd->propertyValueSourceCast = type.valueSourceCast;
+    d->extraData.cd->propertyValueInterceptorCast = type.valueInterceptorCast;
+    d->extraData.cd->extFunc = type.extensionObjectCreate;
+    d->extraData.cd->customParser = type.customParser;
+    d->extraData.cd->registerEnumClassesUnscoped = true;
+
+    if (type.extensionMetaObject)
+        d->extraData.cd->extMetaObject = type.extensionMetaObject;
+
+    // Check if the user wants only scoped enum classes
+    if (d->baseMetaObject) {
+        auto indexOfClassInfo = d->baseMetaObject->indexOfClassInfo("RegisterEnumClassesUnscoped");
+        if (indexOfClassInfo != -1 && QString::fromUtf8(d->baseMetaObject->classInfo(indexOfClassInfo).value()) == QLatin1String("false"))
+            d->extraData.cd->registerEnumClassesUnscoped = false;
+    }
+}
+
+QQmlType::QQmlType(QQmlMetaTypeData *data, const QString &elementName, const QQmlPrivate::RegisterCompositeType &type)
+    : d(new QQmlTypePrivate(CompositeType))
+{
+    data->registerType(d);
+
+    d->elementName = elementName;
+
+    d->module = QString::fromUtf8(type.uri);
+    d->version_maj = type.versionMajor;
+    d->version_min = type.versionMinor;
+
+    d->extraData.fd->url = QQmlTypeLoader::normalize(type.url);
+}
+
+QQmlType::QQmlType()
+    : d(nullptr)
+{
+}
+
+QQmlType::QQmlType(const QQmlType &other)
+    : d(other.d)
+{
+    if (d)
+        d->refCount.ref();
+}
+
+QQmlType &QQmlType::operator =(const QQmlType &other)
+{
+    if (d != other.d) {
+        if (d && !d->refCount.deref())
+            delete d;
+        d = other.d;
+        if (d)
+            d->refCount.ref();
+    }
+    return *this;
+}
+
+QQmlType::QQmlType(QQmlTypePrivate *priv)
+    : d(priv)
+{
+    if (d)
+        d->refCount.ref();
+}
+
+QQmlType::~QQmlType()
+{
+    if (d && !d->refCount.deref()) {
+        // If attached properties were successfully registered, deregister them.
+        // (They may not have been registered if some other type used the same baseMetaObject)
+        if (d->regType == CppType && d->extraData.cd->attachedPropertiesType) {
+            auto it = QQmlTypePrivate::attachedPropertyIds.find(d->baseMetaObject);
+            if (it != QQmlTypePrivate::attachedPropertyIds.end() && *it == d->index)
+                QQmlTypePrivate::attachedPropertyIds.erase(it);
+        }
+        delete d;
+    }
+}
+
+QHashedString QQmlType::module() const
+{
+    if (!d)
+        return QHashedString();
+    return d->module;
+}
+
+int QQmlType::majorVersion() const
+{
+    if (!d)
+        return -1;
+    return d->version_maj;
+}
+
+int QQmlType::minorVersion() const
+{
+    if (!d)
+        return -1;
+    return d->version_min;
+}
+
+bool QQmlType::availableInVersion(int vmajor, int vminor) const
+{
+    Q_ASSERT(vmajor >= 0 && vminor >= 0);
+    if (!d)
+        return false;
+    return vmajor == d->version_maj && vminor >= d->version_min;
+}
+
+bool QQmlType::availableInVersion(const QHashedStringRef &module, int vmajor, int vminor) const
+{
+    Q_ASSERT(vmajor >= 0 && vminor >= 0);
+    if (!d)
+        return false;
+    return module == d->module && vmajor == d->version_maj && vminor >= d->version_min;
+}
+
+// returns the nearest _registered_ super class
+QQmlType QQmlType::superType() const
+{
+    if (!d)
+        return QQmlType();
+    if (!d->haveSuperType && d->baseMetaObject) {
+        const QMetaObject *mo = d->baseMetaObject->superClass();
+        while (mo && !d->superType.isValid()) {
+            d->superType = QQmlMetaType::qmlType(mo, d->module, d->version_maj, d->version_min);
+            mo = mo->superClass();
+        }
+        d->haveSuperType = true;
+    }
+
+    return d->superType;
+}
+
+QQmlType QQmlType::resolveCompositeBaseType(QQmlEnginePrivate *engine) const
+{
+    Q_ASSERT(isComposite());
+    if (!engine || !d)
+        return QQmlType();
+    QQmlRefPointer<QQmlTypeData> td(engine->typeLoader.getType(sourceUrl()));
+    if (td.isNull() || !td->isComplete())
+        return QQmlType();
+    QV4::CompiledData::CompilationUnit *compilationUnit = td->compilationUnit();
+    const QMetaObject *mo = compilationUnit->rootPropertyCache()->firstCppMetaObject();
+    return QQmlMetaType::qmlType(mo);
+}
+
+QQmlPropertyCache *QQmlType::compositePropertyCache(QQmlEnginePrivate *engine) const
+{
+    // similar logic to resolveCompositeBaseType
+    Q_ASSERT(isComposite());
+    if (!engine)
+        return nullptr;
+    QQmlRefPointer<QQmlTypeData> td(engine->typeLoader.getType(sourceUrl()));
+    if (td.isNull() || !td->isComplete())
+        return nullptr;
+    QV4::CompiledData::CompilationUnit *compilationUnit = td->compilationUnit();
+    return compilationUnit->rootPropertyCache().data();
+}
+
+static bool isPropertyRevisioned(const QMetaObject *mo, int index)
+{
+    int i = index;
+    i -= mo->propertyOffset();
+    if (i < 0 && mo->d.superdata)
+        return isPropertyRevisioned(mo->d.superdata, index);
+
+    const QMetaObjectPrivate *mop = reinterpret_cast<const QMetaObjectPrivate*>(mo->d.data);
+    if (i >= 0 && i < mop->propertyCount) {
+        int handle = mop->propertyData + 3*i;
+        int flags = mo->d.data[handle + 2];
+
+        return (flags & Revisioned);
+    }
+
+    return false;
+}
+
+void QQmlTypePrivate::init() const
+{
+    if (isSetup)
+        return;
+
+    QMutexLocker lock(QQmlMetaType::typeRegistrationLock());
+    if (isSetup)
+        return;
+
+    const QMetaObject *mo = baseMetaObject;
+    if (!mo) {
+        // version 0 singleton type without metaobject information
+        return;
+    }
+
+    if (regType == QQmlType::CppType) {
+        // Setup extended meta object
+        // XXX - very inefficient
+        if (extraData.cd->extFunc) {
+            QMetaObjectBuilder builder;
+            QQmlMetaType::clone(builder, extraData.cd->extMetaObject, extraData.cd->extMetaObject,
+                                extraData.cd->extMetaObject);
+            builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
+            QMetaObject *mmo = builder.toMetaObject();
+            mmo->d.superdata = mo;
+            QQmlProxyMetaObject::ProxyData data = { mmo, extraData.cd->extFunc, 0, 0 };
+            metaObjects << data;
+        }
+    }
+
+    metaObjects.append(QQmlMetaType::proxyData(
+            mo, baseMetaObject, metaObjects.isEmpty() ? nullptr
+                                                      : metaObjects.constLast().metaObject));
+
+    for (int ii = 0; ii < metaObjects.count(); ++ii) {
+        metaObjects[ii].propertyOffset =
+                metaObjects.at(ii).metaObject->propertyOffset();
+        metaObjects[ii].methodOffset =
+                metaObjects.at(ii).metaObject->methodOffset();
+    }
+
+    // Check for revisioned details
+    {
+        const QMetaObject *mo = nullptr;
+        if (metaObjects.isEmpty())
+            mo = baseMetaObject;
+        else
+            mo = metaObjects.constFirst().metaObject;
+
+        for (int ii = 0; !containsRevisionedAttributes && ii < mo->propertyCount(); ++ii) {
+            if (isPropertyRevisioned(mo, ii))
+                containsRevisionedAttributes = true;
+        }
+
+        for (int ii = 0; !containsRevisionedAttributes && ii < mo->methodCount(); ++ii) {
+            if (mo->method(ii).revision() != 0)
+                containsRevisionedAttributes = true;
+        }
+    }
+
+    isSetup = true;
+    lock.unlock();
+}
+
+void QQmlTypePrivate::initEnums(const QQmlPropertyCache *cache) const
+{
+    if (isEnumSetup) return;
+
+    init();
+
+    QMutexLocker lock(QQmlMetaType::typeRegistrationLock());
+    if (isEnumSetup) return;
+
+    if (cache)
+        insertEnumsFromPropertyCache(cache);
+    if (baseMetaObject) // could be singleton type without metaobject
+        insertEnums(baseMetaObject);
+
+    isEnumSetup = true;
+}
+
+void QQmlTypePrivate::insertEnums(const QMetaObject *metaObject) const
+{
+    // Add any enum values defined by 'related' classes
+    if (metaObject->d.relatedMetaObjects) {
+        const auto *related = metaObject->d.relatedMetaObjects;
+        if (related) {
+            while (*related)
+                insertEnums(*related++);
+        }
+    }
+
+    QSet<QString> localEnums;
+    const QMetaObject *localMetaObject = nullptr;
+
+    // Add any enum values defined by this class, overwriting any inherited values
+    for (int ii = 0; ii < metaObject->enumeratorCount(); ++ii) {
+        QMetaEnum e = metaObject->enumerator(ii);
+        const bool isScoped = e.isScoped();
+        QStringHash<int> *scoped = isScoped ? new QStringHash<int>() : nullptr;
+
+    // We allow enums in sub-classes to overwrite enums from base-classes, such as
+    // ListView.Center (from enum PositionMode) overwriting Item.Center (from enum TransformOrigin).
+    // This is acceptable because the _use_ of the enum from the QML side requires qualification
+    // anyway, i.e. ListView.Center vs. Item.Center.
+        // However if a class defines two enums with the same value, then that must produce a warning
+        // because it represents a valid conflict.
+        if (e.enclosingMetaObject() != localMetaObject) {
+            localEnums.clear();
+            localMetaObject = e.enclosingMetaObject();
+        }
+
+        for (int jj = 0; jj < e.keyCount(); ++jj) {
+            const QString key = QString::fromUtf8(e.key(jj));
+            const int value = e.value(jj);
+            if (!isScoped || (regType == QQmlType::CppType && extraData.cd->registerEnumClassesUnscoped)) {
+                if (localEnums.contains(key)) {
+                    auto existingEntry = enums.find(key);
+                    if (existingEntry != enums.end() && existingEntry.value() != value) {
+                        qWarning("Previously registered enum will be overwritten due to name clash: %s.%s", metaObject->className(), key.toUtf8().constData());
+                        createEnumConflictReport(metaObject, key);
+                    }
+                } else {
+                    localEnums.insert(key);
+                }
+                enums.insert(key, value);
+            }
+            if (isScoped)
+                scoped->insert(key, value);
+        }
+
+        if (isScoped) {
+            scopedEnums << scoped;
+            scopedEnumIndex.insert(QString::fromUtf8(e.name()), scopedEnums.count()-1);
+        }
+    }
+}
+
+void QQmlTypePrivate::createListOfPossibleConflictingItems(const QMetaObject *metaObject, QList<EnumInfo> &enumInfoList, QStringList path) const
+{
+    path.append(QString::fromUtf8(metaObject->className()));
+
+    if (metaObject->d.relatedMetaObjects) {
+        const auto *related = metaObject->d.relatedMetaObjects;
+        if (related) {
+            while (*related)
+                createListOfPossibleConflictingItems(*related++, enumInfoList, path);
+        }
+    }
+
+    for (int ii = 0; ii < metaObject->enumeratorCount(); ++ii) {
+        const auto e = metaObject->enumerator(ii);
+
+        for (int jj = 0; jj < e.keyCount(); ++jj) {
+            const QString key = QString::fromUtf8(e.key(jj));
+
+            EnumInfo enumInfo;
+            enumInfo.metaObjectName = QString::fromUtf8(metaObject->className());
+            enumInfo.enumName = QString::fromUtf8(e.name());
+            enumInfo.enumKey = key;
+            enumInfo.scoped = e.isScoped();
+            enumInfo.path = path;
+            enumInfo.metaEnumScope = QString::fromUtf8(e.scope());
+            enumInfoList.append(enumInfo);
+        }
+    }
+}
+
+void QQmlTypePrivate::createEnumConflictReport(const QMetaObject *metaObject, const QString &conflictingKey) const
+{
+    QList<EnumInfo> enumInfoList;
+
+    if (baseMetaObject) // prefer baseMetaObject if available
+        metaObject = baseMetaObject;
+
+    if (!metaObject) { // If there is no metaObject at all return early
+        qWarning() << "No meta object information available. Skipping conflict analysis.";
+        return;
+    }
+
+    createListOfPossibleConflictingItems(metaObject, enumInfoList, QStringList());
+
+    qWarning().noquote() << QLatin1String("Possible conflicting items:");
+    // find items with conflicting key
+    for (const auto i : enumInfoList) {
+        if (i.enumKey == conflictingKey)
+        qWarning().noquote().nospace() << "    " << i.metaObjectName << "." << i.enumName << "." << i.enumKey << " from scope "
+                                           << i.metaEnumScope << " injected by " << i.path.join(QLatin1String("->"));
+    }
+}
+
+void QQmlTypePrivate::insertEnumsFromPropertyCache(const QQmlPropertyCache *cache) const
+{
+    const QMetaObject *cppMetaObject = cache->firstCppMetaObject();
+
+    while (cache && cache->metaObject() != cppMetaObject) {
+
+        int count = cache->qmlEnumCount();
+        for (int ii = 0; ii < count; ++ii) {
+            QStringHash<int> *scoped = new QStringHash<int>();
+            QQmlEnumData *enumData = cache->qmlEnum(ii);
+
+            for (int jj = 0; jj < enumData->values.count(); ++jj) {
+                const QQmlEnumValue &value = enumData->values.at(jj);
+                enums.insert(value.namedValue, value.value);
+                scoped->insert(value.namedValue, value.value);
+            }
+            scopedEnums << scoped;
+            scopedEnumIndex.insert(enumData->name, scopedEnums.count()-1);
+        }
+        cache = cache->parent();
+    }
+    insertEnums(cppMetaObject);
+}
+
+
+QQmlPropertyCache *QQmlTypePrivate::propertyCacheForMinorVersion(int minorVersion) const
+{
+    for (int i = 0; i < propertyCaches.count(); ++i)
+        if (propertyCaches.at(i).minorVersion == minorVersion)
+            return propertyCaches.at(i).cache.data();
+    return nullptr;
+}
+
+void QQmlTypePrivate::setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache)
+{
+    for (int i = 0; i < propertyCaches.count(); ++i) {
+        if (propertyCaches.at(i).minorVersion == minorVersion) {
+            propertyCaches[i].cache = cache;
+            return;
+        }
+    }
+    propertyCaches.append(PropertyCacheByMinorVersion(cache, minorVersion));
+}
+
+QByteArray QQmlType::typeName() const
+{
+    if (d) {
+        if (d->regType == SingletonType || d->regType == CompositeSingletonType)
+            return d->extraData.sd->singletonInstanceInfo->typeName.toUtf8();
+        else if (d->baseMetaObject)
+            return d->baseMetaObject->className();
+    }
+    return QByteArray();
+}
+
+QString QQmlType::elementName() const
+{
+    if (!d)
+        return QString();
+    return d->elementName;
+}
+
+QString QQmlType::qmlTypeName() const
+{
+    if (!d)
+        return QString();
+    if (d->name.isEmpty()) {
+        if (!d->module.isEmpty())
+            d->name = static_cast<QString>(d->module) + QLatin1Char('/') + d->elementName;
+        else
+            d->name = d->elementName;
+    }
+
+    return d->name;
+}
+
+QObject *QQmlType::create() const
+{
+    if (!d || !isCreatable())
+        return nullptr;
+
+    d->init();
+
+    QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize);
+    d->extraData.cd->newFunc(rv);
+
+    if (rv && !d->metaObjects.isEmpty())
+        (void)new QQmlProxyMetaObject(rv, &d->metaObjects);
+
+    return rv;
+}
+
+void QQmlType::create(QObject **out, void **memory, size_t additionalMemory) const
+{
+    if (!d || !isCreatable())
+        return;
+
+    d->init();
+
+    QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize + additionalMemory);
+    d->extraData.cd->newFunc(rv);
+
+    if (rv && !d->metaObjects.isEmpty())
+        (void)new QQmlProxyMetaObject(rv, &d->metaObjects);
+
+    *out = rv;
+    *memory = ((char *)rv) + d->extraData.cd->allocationSize;
+}
+
+QQmlType::SingletonInstanceInfo *QQmlType::singletonInstanceInfo() const
+{
+    if (!d)
+        return nullptr;
+    if (d->regType != SingletonType && d->regType != CompositeSingletonType)
+        return nullptr;
+    return d->extraData.sd->singletonInstanceInfo;
+}
+
+QQmlCustomParser *QQmlType::customParser() const
+{
+    if (!d)
+        return nullptr;
+    if (d->regType != CppType)
+        return nullptr;
+    return d->extraData.cd->customParser;
+}
+
+QQmlType::CreateFunc QQmlType::createFunction() const
+{
+    if (!d || d->regType != CppType)
+        return nullptr;
+    return d->extraData.cd->newFunc;
+}
+
+QString QQmlType::noCreationReason() const
+{
+    if (!d || d->regType != CppType)
+        return QString();
+    return d->extraData.cd->noCreationReason;
+}
+
+bool QQmlType::isCreatable() const
+{
+    return d && d->regType == CppType && d->extraData.cd->newFunc;
+}
+
+QQmlType::ExtensionFunc QQmlType::extensionFunction() const
+{
+    if (!d || d->regType != CppType)
+        return nullptr;
+    return d->extraData.cd->extFunc;
+}
+
+bool QQmlType::isExtendedType() const
+{
+    if (!d)
+        return false;
+    d->init();
+
+    return !d->metaObjects.isEmpty();
+}
+
+bool QQmlType::isSingleton() const
+{
+    return d && (d->regType == SingletonType || d->regType == CompositeSingletonType);
+}
+
+bool QQmlType::isInterface() const
+{
+    return d && d->regType == InterfaceType;
+}
+
+bool QQmlType::isComposite() const
+{
+    return d && (d->regType == CompositeType || d->regType == CompositeSingletonType);
+}
+
+bool QQmlType::isCompositeSingleton() const
+{
+    return d && d->regType == CompositeSingletonType;
+}
+
+int QQmlType::typeId() const
+{
+    return d ? d->typeId : -1;
+}
+
+int QQmlType::qListTypeId() const
+{
+    return d ? d->listId : -1;
+}
+
+const QMetaObject *QQmlType::metaObject() const
+{
+    if (!d)
+        return nullptr;
+    d->init();
+
+    if (d->metaObjects.isEmpty())
+        return d->baseMetaObject;
+    else
+        return d->metaObjects.constFirst().metaObject;
+
+}
+
+const QMetaObject *QQmlType::baseMetaObject() const
+{
+    return d ? d->baseMetaObject : nullptr;
+}
+
+bool QQmlType::containsRevisionedAttributes() const
+{
+    if (!d)
+        return false;
+    d->init();
+
+    return d->containsRevisionedAttributes;
+}
+
+int QQmlType::metaObjectRevision() const
+{
+    return d ? d->revision : -1;
+}
+
+QQmlAttachedPropertiesFunc QQmlType::attachedPropertiesFunction(QQmlEnginePrivate *engine) const
+{
+    if (!d)
+        return nullptr;
+    if (d->regType == CppType)
+        return d->extraData.cd->attachedPropertiesFunc;
+
+    QQmlType base;
+    if (d->regType == CompositeType)
+        base = resolveCompositeBaseType(engine);
+    return base.attachedPropertiesFunction(engine);
+}
+
+const QMetaObject *QQmlType::attachedPropertiesType(QQmlEnginePrivate *engine) const
+{
+    if (!d)
+        return nullptr;
+    if (d->regType == CppType)
+        return d->extraData.cd->attachedPropertiesType;
+
+    QQmlType base;
+    if (d->regType == CompositeType)
+        base = resolveCompositeBaseType(engine);
+    return base.attachedPropertiesType(engine);
+}
+
+/*
+This is the id passed to qmlAttachedPropertiesById().  This is different from the index
+for the case that a single class is registered under two or more names (eg. Item in
+Qt 4.7 and QtQuick 1.0).
+*/
+int QQmlType::attachedPropertiesId(QQmlEnginePrivate *engine) const
+{
+    if (!d)
+        return -1;
+    if (d->regType == CppType)
+        return d->extraData.cd->attachedPropertiesId;
+
+    QQmlType base;
+    if (d->regType == CompositeType)
+        base = resolveCompositeBaseType(engine);
+    return base.attachedPropertiesId(engine);
+}
+
+int QQmlType::parserStatusCast() const
+{
+    if (!d || d->regType != CppType)
+        return -1;
+    return d->extraData.cd->parserStatusCast;
+}
+
+int QQmlType::propertyValueSourceCast() const
+{
+    if (!d || d->regType != CppType)
+        return -1;
+    return d->extraData.cd->propertyValueSourceCast;
+}
+
+int QQmlType::propertyValueInterceptorCast() const
+{
+    if (!d || d->regType != CppType)
+        return -1;
+    return d->extraData.cd->propertyValueInterceptorCast;
+}
+
+const char *QQmlType::interfaceIId() const
+{
+    if (!d || d->regType != InterfaceType)
+        return nullptr;
+    return d->iid;
+}
+
+int QQmlType::index() const
+{
+    return d ? d->index : -1;
+}
+
+QUrl QQmlType::sourceUrl() const
+{
+    if (d) {
+        if (d->regType == CompositeType)
+            return d->extraData.fd->url;
+        else if (d->regType == CompositeSingletonType)
+            return d->extraData.sd->singletonInstanceInfo->url;
+    }
+    return QUrl();
+}
+
+int QQmlType::enumValue(QQmlEnginePrivate *engine, const QHashedStringRef &name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->enums.value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::enumValue(QQmlEnginePrivate *engine, const QHashedCStringRef &name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->enums.value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::enumValue(QQmlEnginePrivate *engine, const QV4::String *name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->enums.value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QV4::String *name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->scopedEnumIndex.value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QString &name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->scopedEnumIndex.value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *name, bool *ok) const
+{
+    Q_UNUSED(engine)
+    Q_ASSERT(ok);
+    *ok = true;
+
+    if (d) {
+        Q_ASSERT(index > -1 && index < d->scopedEnums.count());
+        int *rv = d->scopedEnums.at(index)->value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &name, bool *ok) const
+{
+    Q_UNUSED(engine)
+    Q_ASSERT(ok);
+    *ok = true;
+
+    if (d) {
+        Q_ASSERT(index > -1 && index < d->scopedEnums.count());
+        int *rv = d->scopedEnums.at(index)->value(name);
+        if (rv)
+            return *rv;
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, const QByteArray &scopedEnumName, const QByteArray &name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->scopedEnumIndex.value(QHashedCStringRef(scopedEnumName.constData(), scopedEnumName.length()));
+        if (rv) {
+            int index = *rv;
+            Q_ASSERT(index > -1 && index < d->scopedEnums.count());
+            rv = d->scopedEnums.at(index)->value(QHashedCStringRef(name.constData(), name.length()));
+            if (rv)
+                return *rv;
+        }
+    }
+
+    *ok = false;
+    return -1;
+}
+
+int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, const QStringRef &scopedEnumName, const QStringRef &name, bool *ok) const
+{
+    Q_ASSERT(ok);
+    if (d) {
+        const QQmlPropertyCache *cache = isComposite() ? compositePropertyCache(engine) : nullptr;
+        *ok = true;
+
+        d->initEnums(cache);
+
+        int *rv = d->scopedEnumIndex.value(QHashedStringRef(scopedEnumName));
+        if (rv) {
+            int index = *rv;
+            Q_ASSERT(index > -1 && index < d->scopedEnums.count());
+            rv = d->scopedEnums.at(index)->value(QHashedStringRef(name));
+            if (rv)
+                return *rv;
+        }
+    }
+
+    *ok = false;
+    return -1;
+}
+
+void QQmlType::refHandle(QQmlTypePrivate *priv)
+{
+    if (priv)
+        priv->refCount.ref();
+}
+
+void QQmlType::derefHandle(QQmlTypePrivate *priv)
+{
+    if (priv && !priv->refCount.deref())
+        delete priv;
+}
+
+int QQmlType::refCount(QQmlTypePrivate *priv)
+{
+    if (priv)
+        return priv->refCount;
+    return -1;
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmltype_p.h b/src/qml/qml/qqmltype_p.h
new file mode 100644
index 0000000000..edc1b01a07
--- /dev/null
+++ b/src/qml/qml/qqmltype_p.h
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLTYPE_P_H
+#define QQMLTYPE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qtqmlglobal_p.h>
+
+#include <QtQml/qqmlprivate.h>
+#include <QtQml/qjsvalue.h>
+
+#include <QtCore/qobject.h>
+
+QT_BEGIN_NAMESPACE
+
+struct QQmlMetaTypeData;
+class QHashedCStringRef;
+class QQmlTypePrivate;
+class QHashedString;
+class QHashedStringRef;
+class QQmlCustomParser;
+class QQmlEnginePrivate;
+class QQmlPropertyCache;
+
+namespace QV4 {
+struct String;
+}
+
+class Q_QML_PRIVATE_EXPORT QQmlType
+{
+public:
+    QQmlType();
+    QQmlType(const QQmlType &other);
+    QQmlType &operator =(const QQmlType &other);
+    explicit QQmlType(QQmlTypePrivate *priv);
+    ~QQmlType();
+
+    bool operator ==(const QQmlType &other) const {
+        return d == other.d;
+    }
+
+    bool isValid() const { return d != nullptr; }
+    const QQmlTypePrivate *key() const { return d; }
+
+    QByteArray typeName() const;
+    QString qmlTypeName() const;
+    QString elementName() const;
+
+    QHashedString module() const;
+    int majorVersion() const;
+    int minorVersion() const;
+
+    bool availableInVersion(int vmajor, int vminor) const;
+    bool availableInVersion(const QHashedStringRef &module, int vmajor, int vminor) const;
+
+    QObject *create() const;
+    void create(QObject **, void **, size_t) const;
+
+    typedef void (*CreateFunc)(void *);
+    CreateFunc createFunction() const;
+    QQmlCustomParser *customParser() const;
+
+    bool isCreatable() const;
+    typedef QObject *(*ExtensionFunc)(QObject *);
+    ExtensionFunc extensionFunction() const;
+    bool isExtendedType() const;
+    QString noCreationReason() const;
+
+    bool isSingleton() const;
+    bool isInterface() const;
+    bool isComposite() const;
+    bool isCompositeSingleton() const;
+
+    int typeId() const;
+    int qListTypeId() const;
+
+    const QMetaObject *metaObject() const;
+    const QMetaObject *baseMetaObject() const;
+    int metaObjectRevision() const;
+    bool containsRevisionedAttributes() const;
+
+    QQmlAttachedPropertiesFunc attachedPropertiesFunction(QQmlEnginePrivate *engine) const;
+    const QMetaObject *attachedPropertiesType(QQmlEnginePrivate *engine) const;
+    int attachedPropertiesId(QQmlEnginePrivate *engine) const;
+
+    int parserStatusCast() const;
+    const char *interfaceIId() const;
+    int propertyValueSourceCast() const;
+    int propertyValueInterceptorCast() const;
+
+    int index() const;
+
+    class Q_QML_PRIVATE_EXPORT SingletonInstanceInfo
+    {
+    public:
+        SingletonInstanceInfo()
+            : scriptCallback(nullptr), qobjectCallback(nullptr), instanceMetaObject(nullptr) {}
+
+        QJSValue (*scriptCallback)(QQmlEngine *, QJSEngine *);
+        QObject *(*qobjectCallback)(QQmlEngine *, QJSEngine *);
+        const QMetaObject *instanceMetaObject;
+        QString typeName;
+        QUrl url; // used by composite singletons
+
+        void setQObjectApi(QQmlEngine *, QObject *);
+        QObject *qobjectApi(QQmlEngine *) const;
+        void setScriptApi(QQmlEngine *, const QJSValue &);
+        QJSValue scriptApi(QQmlEngine *) const;
+
+        void init(QQmlEngine *);
+        void destroy(QQmlEngine *);
+
+        QHash<QQmlEngine *, QJSValue> scriptApis;
+        QHash<QQmlEngine *, QObject *> qobjectApis;
+    };
+    SingletonInstanceInfo *singletonInstanceInfo() const;
+
+    QUrl sourceUrl() const;
+
+    int enumValue(QQmlEnginePrivate *engine, const QHashedStringRef &, bool *ok) const;
+    int enumValue(QQmlEnginePrivate *engine, const QHashedCStringRef &, bool *ok) const;
+    int enumValue(QQmlEnginePrivate *engine, const QV4::String *, bool *ok) const;
+
+    int scopedEnumIndex(QQmlEnginePrivate *engine, const QV4::String *, bool *ok) const;
+    int scopedEnumIndex(QQmlEnginePrivate *engine, const QString &, bool *ok) const;
+    int scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *, bool *ok) const;
+    int scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &, bool *ok) const;
+    int scopedEnumValue(QQmlEnginePrivate *engine, const QByteArray &, const QByteArray &, bool *ok) const;
+    int scopedEnumValue(QQmlEnginePrivate *engine, const QStringRef &, const QStringRef &, bool *ok) const;
+
+    QQmlTypePrivate *priv() const { return d; }
+    static void refHandle(QQmlTypePrivate *priv);
+    static void derefHandle(QQmlTypePrivate *priv);
+    static int refCount(QQmlTypePrivate *priv);
+
+    enum RegistrationType {
+        CppType = 0,
+        SingletonType = 1,
+        InterfaceType = 2,
+        CompositeType = 3,
+        CompositeSingletonType = 4,
+        AnyRegistrationType = 255
+    };
+
+private:
+    QQmlType superType() const;
+    QQmlType resolveCompositeBaseType(QQmlEnginePrivate *engine) const;
+    int resolveCompositeEnumValue(QQmlEnginePrivate *engine, const QString &name, bool *ok) const;
+    QQmlPropertyCache *compositePropertyCache(QQmlEnginePrivate *engine) const;
+    friend class QQmlTypePrivate;
+
+    friend QString registrationTypeString(RegistrationType);
+    friend bool checkRegistration(RegistrationType, QQmlMetaTypeData *, const char *, const QString &, int);
+    friend QQmlType registerType(const QQmlPrivate::RegisterType &);
+    friend QQmlType registerSingletonType(const QQmlPrivate::RegisterSingletonType &);
+    friend QQmlType registerInterface(const QQmlPrivate::RegisterInterface &);
+    friend int registerQmlUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &);
+    friend uint qHash(const QQmlType &t, uint seed);
+    friend Q_QML_EXPORT void qmlClearTypeRegistrations();
+    friend class QQmlMetaType;
+
+    QQmlType(QQmlMetaTypeData *data, const QQmlPrivate::RegisterInterface &);
+    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterSingletonType &);
+    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterType &);
+    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterCompositeType &);
+    QQmlType(QQmlMetaTypeData *data, const QString &, const QQmlPrivate::RegisterCompositeSingletonType &);
+
+    QQmlTypePrivate *d;
+};
+
+inline uint qHash(const QQmlType &t, uint seed = 0) { return qHash(reinterpret_cast<quintptr>(t.d), seed); }
+
+QT_END_NAMESPACE
+
+#endif // QQMLTYPE_P_H
diff --git a/src/qml/qml/qqmltype_p_p.h b/src/qml/qml/qqmltype_p_p.h
new file mode 100644
index 0000000000..6ad418b24d
--- /dev/null
+++ b/src/qml/qml/qqmltype_p_p.h
@@ -0,0 +1,160 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLTYPE_P_P_H
+#define QQMLTYPE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qqmltype_p.h>
+#include <private/qhashedstring_p.h>
+#include <private/qqmlproxymetaobject_p.h>
+#include <private/qqmlrefcount_p.h>
+#include <private/qqmlpropertycache_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlTypePrivate
+{
+    Q_DISABLE_COPY(QQmlTypePrivate)
+public:
+    QQmlTypePrivate(QQmlType::RegistrationType type);
+    ~QQmlTypePrivate();
+
+    void init() const;
+    void initEnums(const QQmlPropertyCache *cache = nullptr) const;
+    void insertEnums(const QMetaObject *metaObject) const;
+    void insertEnumsFromPropertyCache(const QQmlPropertyCache *cache) const;
+
+    QAtomicInt refCount;
+    QQmlType::RegistrationType regType;
+
+    struct QQmlCppTypeData
+    {
+        int allocationSize;
+        void (*newFunc)(void *);
+        QString noCreationReason;
+        int parserStatusCast;
+        QObject *(*extFunc)(QObject *);
+        const QMetaObject *extMetaObject;
+        QQmlCustomParser *customParser;
+        QQmlAttachedPropertiesFunc attachedPropertiesFunc;
+        const QMetaObject *attachedPropertiesType;
+        int attachedPropertiesId;
+        int propertyValueSourceCast;
+        int propertyValueInterceptorCast;
+        bool registerEnumClassesUnscoped;
+    };
+
+    struct QQmlSingletonTypeData
+    {
+        QQmlType::SingletonInstanceInfo *singletonInstanceInfo;
+    };
+
+    struct QQmlCompositeTypeData
+    {
+        QUrl url;
+    };
+
+    union extraData {
+        QQmlCppTypeData* cd;
+        QQmlSingletonTypeData* sd;
+        QQmlCompositeTypeData* fd;
+    } extraData;
+
+    const char *iid;
+    QHashedString module;
+    QString name;
+    QString elementName;
+    int version_maj;
+    int version_min;
+    int typeId;
+    int listId;
+    int revision;
+    mutable bool containsRevisionedAttributes;
+    mutable QQmlType superType;
+    const QMetaObject *baseMetaObject;
+
+    int index;
+    mutable volatile bool isSetup:1;
+    mutable volatile bool isEnumSetup:1;
+    mutable bool haveSuperType:1;
+    mutable QList<QQmlProxyMetaObject::ProxyData> metaObjects;
+    mutable QStringHash<int> enums;
+    mutable QStringHash<int> scopedEnumIndex; // maps from enum name to index in scopedEnums
+    mutable QList<QStringHash<int>*> scopedEnums;
+
+    static QHash<const QMetaObject *, int> attachedPropertyIds;
+
+    struct PropertyCacheByMinorVersion
+    {
+        PropertyCacheByMinorVersion() : cache(nullptr), minorVersion(-1) {}
+        explicit PropertyCacheByMinorVersion(QQmlPropertyCache *pc, int ver) : cache(pc), minorVersion(ver) {}
+        QQmlPropertyCachePtr cache;
+        int minorVersion;
+    };
+    QVector<PropertyCacheByMinorVersion> propertyCaches;
+    QQmlPropertyCache *propertyCacheForMinorVersion(int minorVersion) const;
+    void setPropertyCacheForMinorVersion(int minorVersion, QQmlPropertyCache *cache);
+private:
+    struct EnumInfo {
+        QStringList path;
+        QString metaObjectName;
+        QString enumName;
+        QString enumKey;
+        QString metaEnumScope;
+        bool scoped;
+    };
+
+    void createListOfPossibleConflictingItems(const QMetaObject *metaObject, QList<EnumInfo> &enumInfoList, QStringList path) const;
+    void createEnumConflictReport(const QMetaObject *metaObject, const QString &conflictingKey) const;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLTYPE_P_P_H
diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp
new file mode 100644
index 0000000000..35be51160f
--- /dev/null
+++ b/src/qml/qml/qqmltypemodule.cpp
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmltypemodule_p_p.h"
+
+#include <private/qqmltype_p_p.h>
+
+#include <QtCore/qmutex.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlTypeModule::QQmlTypeModule()
+    : d(new QQmlTypeModulePrivate)
+{
+}
+
+QQmlTypeModule::~QQmlTypeModule()
+{
+    delete d; d = nullptr;
+}
+
+QString QQmlTypeModule::module() const
+{
+    return d->uri.uri;
+}
+
+int QQmlTypeModule::majorVersion() const
+{
+    return d->uri.majorVersion;
+}
+
+int QQmlTypeModule::minimumMinorVersion() const
+{
+    return d->minMinorVersion;
+}
+
+int QQmlTypeModule::maximumMinorVersion() const
+{
+    return d->maxMinorVersion;
+}
+
+void QQmlTypeModulePrivate::add(QQmlTypePrivate *type)
+{
+    int minVersion = type->version_min;
+    minMinorVersion = qMin(minMinorVersion, minVersion);
+    maxMinorVersion = qMax(maxMinorVersion, minVersion);
+
+    QList<QQmlTypePrivate *> &list = typeHash[type->elementName];
+    for (int ii = 0; ii < list.count(); ++ii) {
+        Q_ASSERT(list.at(ii));
+        if (list.at(ii)->version_min < minVersion) {
+            list.insert(ii, type);
+            return;
+        }
+    }
+    list.append(type);
+}
+
+void QQmlTypeModulePrivate::remove(const QQmlTypePrivate *type)
+{
+    for (TypeHash::ConstIterator elementIt = typeHash.begin(); elementIt != typeHash.end();) {
+        QList<QQmlTypePrivate *> &list = const_cast<QList<QQmlTypePrivate *> &>(elementIt.value());
+
+        QQmlMetaType::removeQQmlTypePrivate(list, type);
+
+#if 0
+        if (list.isEmpty())
+            elementIt = typeHash.erase(elementIt);
+        else
+            ++elementIt;
+#else
+        ++elementIt;
+#endif
+    }
+}
+
+QQmlType QQmlTypeModule::type(const QHashedStringRef &name, int minor) const
+{
+    QMutexLocker lock(QQmlMetaType::typeRegistrationLock());
+
+    QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
+    if (types) {
+        for (int ii = 0; ii < types->count(); ++ii)
+            if (types->at(ii)->version_min <= minor)
+                return QQmlType(types->at(ii));
+    }
+
+    return QQmlType();
+}
+
+QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const
+{
+    QMutexLocker lock(QQmlMetaType::typeRegistrationLock());
+
+    QList<QQmlTypePrivate *> *types = d->typeHash.value(name);
+    if (types) {
+        for (int ii = 0; ii < types->count(); ++ii)
+            if (types->at(ii)->version_min <= minor)
+                return QQmlType(types->at(ii));
+    }
+
+    return QQmlType();
+}
+
+void QQmlTypeModule::walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const
+{
+    QMutexLocker lock(QQmlMetaType::typeRegistrationLock());
+    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));
+        }
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmltypemodule_p.h b/src/qml/qml/qqmltypemodule_p.h
new file mode 100644
index 0000000000..6107988a70
--- /dev/null
+++ b/src/qml/qml/qqmltypemodule_p.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLTYPEMODULE_P_H
+#define QQMLTYPEMODULE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQml/qtqmlglobal.h>
+#include <QtCore/qstring.h>
+
+#include <functional>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlType;
+class QQmlTypePrivate;
+struct QQmlMetaTypeData;
+class QHashedString;
+class QHashedStringRef;
+
+namespace QV4 {
+struct String;
+}
+
+class QQmlTypeModulePrivate;
+class QQmlTypeModule
+{
+public:
+    QString module() const;
+    int majorVersion() const;
+
+    int minimumMinorVersion() const;
+    int maximumMinorVersion() const;
+
+    QQmlType type(const QHashedStringRef &, int) const;
+    QQmlType type(const QV4::String *, int) const;
+
+    void walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const;
+
+    QQmlTypeModulePrivate *priv() { return d; }
+private:
+    //Used by register functions and creates the QQmlTypeModule for them
+    friend QQmlTypeModule *getTypeModule(const QHashedString &uri, int majorVersion, QQmlMetaTypeData *data);
+    friend void addTypeToData(QQmlTypePrivate *type, QQmlMetaTypeData *data);
+    friend struct QQmlMetaTypeData;
+    friend class QQmlMetaType;
+    friend class QQmlTypeModulePrivate;
+
+    QQmlTypeModule();
+    ~QQmlTypeModule();
+    QQmlTypeModulePrivate *d;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLTYPEMODULE_P_H
diff --git a/src/qml/qml/qqmltypemodule_p_p.h b/src/qml/qml/qqmltypemodule_p_p.h
new file mode 100644
index 0000000000..995c4e700a
--- /dev/null
+++ b/src/qml/qml/qqmltypemodule_p_p.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLTYPEMODULE_P_P_H
+#define QQMLTYPEMODULE_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qqmltypemodule_p.h>
+#include <private/qhashedstring_p.h>
+#include <private/qqmlmetatypedata_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlTypeModulePrivate
+{
+public:
+    QQmlTypeModulePrivate()
+        : minMinorVersion(INT_MAX), maxMinorVersion(0), locked(false) {}
+
+    static QQmlTypeModulePrivate* get(QQmlTypeModule* q) { return q->d; }
+
+    QQmlMetaTypeData::VersionedUri uri;
+
+    int minMinorVersion;
+    int maxMinorVersion;
+    bool locked;
+
+    void add(QQmlTypePrivate *);
+    void remove(const QQmlTypePrivate *type);
+
+    typedef QStringHash<QList<QQmlTypePrivate *> > TypeHash;
+    TypeHash typeHash;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLTYPEMODULE_P_P_H
diff --git a/src/qml/qml/qqmltypemoduleversion.cpp b/src/qml/qml/qqmltypemoduleversion.cpp
new file mode 100644
index 0000000000..bbbfa1a7b6
--- /dev/null
+++ b/src/qml/qml/qqmltypemoduleversion.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmltypemoduleversion_p.h"
+
+#include <private/qqmltype_p.h>
+#include <private/qqmltypemodule_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlTypeModuleVersion::QQmlTypeModuleVersion()
+    : m_module(nullptr), m_minor(0)
+{
+}
+
+QQmlTypeModuleVersion::QQmlTypeModuleVersion(QQmlTypeModule *module, int minor)
+    : m_module(module), m_minor(minor)
+{
+    Q_ASSERT(m_module);
+    Q_ASSERT(m_minor >= 0);
+}
+
+QQmlTypeModuleVersion::QQmlTypeModuleVersion(const QQmlTypeModuleVersion &o)
+    : m_module(o.m_module), m_minor(o.m_minor)
+{
+}
+
+QQmlTypeModuleVersion &QQmlTypeModuleVersion::operator=(const QQmlTypeModuleVersion &o)
+{
+    m_module = o.m_module;
+    m_minor = o.m_minor;
+    return *this;
+}
+
+QQmlTypeModule *QQmlTypeModuleVersion::module() const
+{
+    return m_module;
+}
+
+int QQmlTypeModuleVersion::minorVersion() const
+{
+    return m_minor;
+}
+
+QQmlType QQmlTypeModuleVersion::type(const QHashedStringRef &name) const
+{
+    if (!m_module)
+        return QQmlType();
+    return m_module->type(name, m_minor);
+}
+
+QQmlType QQmlTypeModuleVersion::type(const QV4::String *name) const
+{
+    if (!m_module)
+        return QQmlType();
+    return m_module->type(name, m_minor);
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmltypemoduleversion_p.h b/src/qml/qml/qqmltypemoduleversion_p.h
new file mode 100644
index 0000000000..20f4709ecb
--- /dev/null
+++ b/src/qml/qml/qqmltypemoduleversion_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLTYPEMODULEVERSION_P_H
+#define QQMLTYPEMODULEVERSION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQml/qtqmlglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlTypeModule;
+class QQmlType;
+class QHashedStringRef;
+
+namespace QV4 {
+struct String;
+}
+
+class QQmlTypeModuleVersion
+{
+public:
+    QQmlTypeModuleVersion();
+    QQmlTypeModuleVersion(QQmlTypeModule *, int);
+    QQmlTypeModuleVersion(const QQmlTypeModuleVersion &);
+    QQmlTypeModuleVersion &operator=(const QQmlTypeModuleVersion &);
+
+    QQmlTypeModule *module() const;
+    int minorVersion() const;
+
+    QQmlType type(const QHashedStringRef &) const;
+    QQmlType type(const QV4::String *) const;
+
+private:
+    QQmlTypeModule *m_module;
+    int m_minor;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLTYPEMODULEVERSION_P_H
diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h
index 28b5e7f0ad..f7a35a4209 100644
--- a/src/qml/qml/qqmltypenamecache_p.h
+++ b/src/qml/qml/qqmltypenamecache_p.h
@@ -57,6 +57,7 @@
 
 #include <private/qhashedstring_p.h>
 #include <private/qqmlimport_p.h>
+#include <private/qqmltypemoduleversion_p.h>
 
 #include <QtCore/qvector.h>
 
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index e92488f9f6..21505754bb 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qqmlvaluetype_p.h"
-#include "qqmlmetatype_p.h"
 
 #include <private/qqmlglobal_p.h>
 #include <QtCore/qdebug.h>
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index ddd438e56d..cd5cca5ac9 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -113,7 +113,6 @@
 #include "qquickdrag_p.h"
 #include "qquickdroparea_p.h"
 #include "qquickmultipointtoucharea_p.h"
-#include <private/qqmlmetatype_p.h>
 #include <QtQuick/private/qquickaccessibleattached_p.h>
 
 #include "handlers/qquickdraghandler_p.h"