Specify parameters of type registration in class declarations

Using this technique we can automatically register all necessary
revisions and minor versions of a type, using the metaobject system.
This greatly reduces the potential for mistakes and resulting
incompatibilities between versions of imports.

We assume that for each type we need to register all revisions of its
super types and its attached type, and that the revisions match. That
is, if you import version X of type A, you will also get version X of
its attached type and of any super types. As we previously didn't take
these dependencies into account when manually registering the types, a
number of extra revisions are now registered for some types.

Potentially, we can now generate the qmltypes files at compile time,
using moc.

Change-Id: I7abb8a5c39f5e63ad1a0cb41a783f2c91909491b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 10 deletions

diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 9004d1ee6f..1ee9d461b4 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -716,6 +716,8 @@ Returns the created database object.
 class QQuickLocalStorage : public QObject
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(LocalStorage)
+    QML_SINGLETON
 public:
     QQuickLocalStorage(QObject *parent=nullptr) : QObject(parent)
     {
@@ -802,15 +804,6 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args)
 #endif // settings
 }
 
-static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-   Q_UNUSED(engine)
-   Q_UNUSED(scriptEngine)
-   QQuickLocalStorage *api = new QQuickLocalStorage();
-
-   return api;
-}
-
 class QQmlLocalStoragePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -823,7 +816,7 @@ public:
     void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage"));
-        qmlRegisterSingletonType<QQuickLocalStorage>(uri, 2, 0, "LocalStorage", module_api_factory);
+        qmlRegisterTypesAndRevisions<QQuickLocalStorage>(uri, 2);
 
         // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
         qmlRegisterModule(uri, 2, QT_VERSION_MINOR);