1 files changed, 11 insertions, 18 deletions
diff --git a/src/qmlmodels/qqmlmodelsmodule.cpp b/src/qmlmodels/qqmlmodelsmodule.cpp
index 4b753fe49a..7ed8561558 100644
--- a/src/qmlmodels/qqmlmodelsmodule.cpp
+++ b/src/qmlmodels/qqmlmodelsmodule.cpp
@@ -40,16 +40,15 @@
 #include "qqmlmodelsmodule_p.h"
 #include <private/qtqmlmodelsglobal_p.h>
 
-#if QT_CONFIG(itemmodel)
-#include <QtCore/qitemselectionmodel.h>
-#endif
 #if QT_CONFIG(qml_list_model)
 #include <private/qqmllistmodel_p.h>
+#include <private/qqmllistmodelworkeragent_p.h>
 #endif
 #if QT_CONFIG(qml_delegate_model)
 #include <private/qqmldelegatemodel_p.h>
 #include <private/qqmldelegatecomponent_p.h>
 #include <private/qquickpackage_p.h>
+#include <private/qqmlcomponentattached_p.h>
 #endif
 #if QT_CONFIG(qml_object_model)
 #include <private/qqmlobjectmodel_p.h>
@@ -67,24 +66,20 @@ void QQmlModelsModule::defineModule()
     const char uri[] = "QtQml.Models";
 
 #if QT_CONFIG(qml_list_model)
-    qmlRegisterType<QQmlListElement>(uri, 2, 0, "ListElement");
-    qmlRegisterCustomType<QQmlListModel>(uri, 2, 0, "ListModel", new QQmlListModelParser);
+    qmlRegisterTypesAndRevisions<QQmlListElement, QQmlListModel, QQmlListModelWorkerAgent>(uri, 2);
 #endif
 #if QT_CONFIG(qml_delegate_model)
+    // TODO: Get rid of these. It's called DelegateModel and DelegateModelGroup these days.
     qmlRegisterType<QQmlDelegateModel>(uri, 2, 0, "VisualDataModel");
     qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 0, "VisualDataGroup");
-    qmlRegisterType<QQmlDelegateModel>(uri, 2, 1, "DelegateModel");
-    qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 1, "DelegateModelGroup");
-    qmlRegisterType<QQuickPackage>(uri, 2, 0, "Package");
+
+    qmlRegisterTypesAndRevisions<QQmlDelegateModel, QQmlDelegateModelGroup, QQuickPackage>(uri, 2);
 #endif
 #if QT_CONFIG(qml_object_model)
-    qmlRegisterType<QQmlObjectModel>(uri, 2, 1, "ObjectModel");
-    qmlRegisterType<QQmlObjectModel,3>(uri, 2, 3, "ObjectModel");
-    qmlRegisterType<QQmlInstantiator>(uri, 2, 1, "Instantiator");
-    qmlRegisterAnonymousType<QQmlInstanceModel>(uri, 2);
+    qmlRegisterTypesAndRevisions<QQmlObjectModel, QQmlInstantiator, QQmlInstanceModel>(uri, 2);
 #endif
 #if QT_CONFIG(itemmodel)
-    qmlRegisterType<QItemSelectionModel>(uri, 2, 2, "ItemSelectionModel");
+    qmlRegisterTypesAndRevisions<QItemSelectionModelForeign>(uri, 2);
 #endif
 }
 
@@ -93,13 +88,11 @@ void QQmlModelsModule::defineLabsModule()
     const char uri[] = "Qt.labs.qmlmodels";
 
 #if QT_CONFIG(qml_delegate_model)
-    qmlRegisterUncreatableType<QQmlAbstractDelegateComponent>(uri, 1, 0, "AbstractDelegateComponent", QQmlAbstractDelegateComponent::tr("Cannot create instance of abstract class AbstractDelegateComponent."));
-    qmlRegisterType<QQmlDelegateChooser>(uri, 1, 0, "DelegateChooser");
-    qmlRegisterType<QQmlDelegateChoice>(uri, 1, 0, "DelegateChoice");
+    qmlRegisterTypesAndRevisions<
+            QQmlAbstractDelegateComponent, QQmlDelegateChooser, QQmlDelegateChoice>(uri, 1);
 #endif
 #if QT_CONFIG(qml_table_model)
-    qmlRegisterType<QQmlTableModel>(uri, 1, 0, "TableModel");
-    qmlRegisterType<QQmlTableModelColumn>(uri, 1, 0, "TableModelColumn");
+    qmlRegisterTypesAndRevisions<QQmlTableModel, QQmlTableModelColumn>(uri, 1);
 #endif
 }