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

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

3 files changed, 5 insertions, 45 deletions

diff --git a/src/imports/settings/plugin.cpp b/src/imports/settings/plugin.cpp
index db941d9845..24ff43ea6f 100644
--- a/src/imports/settings/plugin.cpp
+++ b/src/imports/settings/plugin.cpp
@@ -44,19 +44,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlSettingsPlugin : public QQmlExtensionPlugin
+class QmlSettingsPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
 
 public:
-    QmlSettingsPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(QByteArray(uri) == QByteArray("Qt.labs.settings"));
-        qmlRegisterTypesAndRevisions<QQmlSettings>(uri, 1);
-        qmlRegisterModule(uri, 1, 1); // QTBUG-73239
-    }
+    QmlSettingsPlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent) {}
 };
 
 QT_END_NAMESPACE
diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes
deleted file mode 100644
index bbc5c1cf8f..0000000000
--- a/src/imports/settings/plugins.qmltypes
+++ /dev/null
@@ -1,36 +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 Qt.labs.settings 1.1'
-
-Module {
-    dependencies: []
-    Component {
-        name: "QQmlSettings"
-        prototype: "QObject"
-        exports: ["Qt.labs.settings/Settings 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "category"; type: "string" }
-        Property { name: "fileName"; type: "string" }
-        Method {
-            name: "value"
-            type: "QVariant"
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "defaultValue"; type: "QVariant" }
-        }
-        Method {
-            name: "value"
-            type: "QVariant"
-            Parameter { name: "key"; type: "string" }
-        }
-        Method {
-            name: "setValue"
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method { name: "sync" }
-    }
-}
diff --git a/src/imports/settings/settings.pro b/src/imports/settings/settings.pro
index 816a6a9fef..d8062a2e55 100644
--- a/src/imports/settings/settings.pro
+++ b/src/imports/settings/settings.pro
@@ -12,4 +12,6 @@ SOURCES += \
     plugin.cpp \
     qqmlsettings.cpp
 
+CONFIG += qmltypes install_qmltypes
+
 load(qml_plugin)