3 files changed, 5 insertions, 34 deletions
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index 607a6cbbdd..d189808f49 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qml
 TARGET  = qmllocalstorageplugin
 TARGETPATH = QtQuick/LocalStorage
-IMPORT_VERSION = 2.$$QT_MINOR_VERSION
+IMPORT_VERSION = 2.15
 
 QT = sql qml-private  core-private
 
@@ -14,4 +14,5 @@ HEADERS += \
 
 load(qml_plugin)
 
+CONFIG += qmltypes install_qmltypes
 OTHER_FILES += localstorage.json
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 6366c51b47..ae9f37784d 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -44,22 +44,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlLocalStoragePlugin : public QQmlExtensionPlugin
+class QQmlLocalStoragePlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
 
 public:
-    QQmlLocalStoragePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent)
+    QQmlLocalStoragePlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent)
     {
     }
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage"));
-        qmlRegisterTypesAndRevisions<QQuickLocalStorage>(uri, 2);
-
-        qmlRegisterModule(uri, 2, 15);
-    }
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
deleted file mode 100644
index 6ed334cc9d..0000000000
--- a/src/imports/localstorage/plugins.qmltypes
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.LocalStorage 2.14'
-
-Module {
-    dependencies: []
-    Component {
-        name: "QQuickLocalStorage"
-        prototype: "QObject"
-        exports: ["QtQuick.LocalStorage/LocalStorage 2.0"]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0]
-        Method {
-            name: "openDatabaseSync"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-    }
-}