Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 3 insertions, 10 deletions

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