Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/imports/folderlistmodel/plugin.cpp
	src/imports/layouts/plugin.cpp
	src/imports/localstorage/plugin.cpp
	src/imports/models/plugin.cpp
	src/imports/particles/plugin.cpp
	src/imports/qtqml/plugin.cpp
	src/imports/qtquick2/plugin.cpp
	src/imports/shapes/plugin.cpp
	src/imports/statemachine/plugin.cpp
	src/imports/testlib/main.cpp
	src/imports/wavefrontmesh/plugin.cpp
	src/imports/window/plugin.cpp
	src/imports/workerscript/plugin.cpp
	src/qml/jsruntime/qv4sequenceobject.cpp
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp
	src/qmlmodels/qqmlmodelsmodule_p.h
	src/qmlworkerscript/qqmlworkerscriptmodule.cpp
	src/qmlworkerscript/qqmlworkerscriptmodule_p.h
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7

3 files changed, 5 insertions, 143 deletions

diff --git a/src/imports/layouts/layouts.pro b/src/imports/layouts/layouts.pro
index addf396746..ea7940e4ad 100644
--- a/src/imports/layouts/layouts.pro
+++ b/src/imports/layouts/layouts.pro
@@ -19,4 +19,6 @@ HEADERS += \
     qquickgridlayoutengine_p.h \
     qquicklayoutstyleinfo_p.h
 
+CONFIG += qmltypes install_qmltypes
+
 load(qml_plugin)
diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp
index 28592213a8..c302b79164 100644
--- a/src/imports/layouts/plugin.cpp
+++ b/src/imports/layouts/plugin.cpp
@@ -45,23 +45,14 @@
 QT_BEGIN_NAMESPACE
 
 //![class decl]
-class QtQuickLayoutsPlugin : public QQmlExtensionPlugin
+class QtQuickLayoutsPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
 public:
-    QtQuickLayoutsPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent)
+    QtQuickLayoutsPlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent)
     {
     }
-    void registerTypes(const char *uri) override
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Layouts"));
-
-        qmlRegisterTypesAndRevisions<QQuickRowLayout, QQuickColumnLayout, QQuickGridLayout,
-                                     QQuickStackLayout, QQuickLayout, QQuickGridLayoutBase>(uri, 1);
-
-        qmlRegisterModule(uri, 1, 15);
-    }
 };
 //![class decl]
 
diff --git a/src/imports/layouts/plugins.qmltypes b/src/imports/layouts/plugins.qmltypes
deleted file mode 100644
index 4ebef4ac51..0000000000
--- a/src/imports/layouts/plugins.qmltypes
+++ /dev/null
@@ -1,131 +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 QtQuick.Layouts 1.14'
-
-Module {
-    dependencies: ["QtQuick 2.0"]
-    Component {
-        name: "QQuickColumnLayout"
-        defaultProperty: "data"
-        prototype: "QQuickLinearLayout"
-        exports: [
-            "QtQuick.Layouts/ColumnLayout 1.0",
-            "QtQuick.Layouts/ColumnLayout 1.1",
-            "QtQuick.Layouts/ColumnLayout 1.11",
-            "QtQuick.Layouts/ColumnLayout 1.4",
-            "QtQuick.Layouts/ColumnLayout 1.7"
-        ]
-        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
-    }
-    Component {
-        name: "QQuickGridLayout"
-        defaultProperty: "data"
-        prototype: "QQuickGridLayoutBase"
-        exports: [
-            "QtQuick.Layouts/GridLayout 1.0",
-            "QtQuick.Layouts/GridLayout 1.1",
-            "QtQuick.Layouts/GridLayout 1.11",
-            "QtQuick.Layouts/GridLayout 1.4",
-            "QtQuick.Layouts/GridLayout 1.7"
-        ]
-        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
-        Enum {
-            name: "Flow"
-            values: {
-                "LeftToRight": 0,
-                "TopToBottom": 1
-            }
-        }
-        Property { name: "columnSpacing"; type: "double" }
-        Property { name: "rowSpacing"; type: "double" }
-        Property { name: "columns"; type: "int" }
-        Property { name: "rows"; type: "int" }
-        Property { name: "flow"; type: "Flow" }
-    }
-    Component {
-        name: "QQuickGridLayoutBase"
-        defaultProperty: "data"
-        prototype: "QQuickLayout"
-        Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Signal { name: "layoutDirectionChanged"; revision: 1 }
-    }
-    Component {
-        name: "QQuickLayout"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: [
-            "QtQuick.Layouts/Layout 1.0",
-            "QtQuick.Layouts/Layout 1.1",
-            "QtQuick.Layouts/Layout 1.11",
-            "QtQuick.Layouts/Layout 1.4",
-            "QtQuick.Layouts/Layout 1.7"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
-        attachedType: "QQuickLayoutAttached"
-    }
-    Component {
-        name: "QQuickLayoutAttached"
-        prototype: "QObject"
-        Property { name: "minimumWidth"; type: "double" }
-        Property { name: "minimumHeight"; type: "double" }
-        Property { name: "preferredWidth"; type: "double" }
-        Property { name: "preferredHeight"; type: "double" }
-        Property { name: "maximumWidth"; type: "double" }
-        Property { name: "maximumHeight"; type: "double" }
-        Property { name: "fillHeight"; type: "bool" }
-        Property { name: "fillWidth"; type: "bool" }
-        Property { name: "row"; type: "int" }
-        Property { name: "column"; type: "int" }
-        Property { name: "rowSpan"; type: "int" }
-        Property { name: "columnSpan"; type: "int" }
-        Property { name: "alignment"; type: "Qt::Alignment" }
-        Property { name: "margins"; type: "double" }
-        Property { name: "leftMargin"; type: "double" }
-        Property { name: "topMargin"; type: "double" }
-        Property { name: "rightMargin"; type: "double" }
-        Property { name: "bottomMargin"; type: "double" }
-    }
-    Component {
-        name: "QQuickLinearLayout"
-        defaultProperty: "data"
-        prototype: "QQuickGridLayoutBase"
-        Property { name: "spacing"; type: "double" }
-    }
-    Component {
-        name: "QQuickRowLayout"
-        defaultProperty: "data"
-        prototype: "QQuickLinearLayout"
-        exports: [
-            "QtQuick.Layouts/RowLayout 1.0",
-            "QtQuick.Layouts/RowLayout 1.1",
-            "QtQuick.Layouts/RowLayout 1.11",
-            "QtQuick.Layouts/RowLayout 1.4",
-            "QtQuick.Layouts/RowLayout 1.7"
-        ]
-        exportMetaObjectRevisions: [0, 1, 11, 4, 7]
-    }
-    Component {
-        name: "QQuickStackLayout"
-        defaultProperty: "data"
-        prototype: "QQuickLayout"
-        exports: [
-            "QtQuick.Layouts/StackLayout 1.11",
-            "QtQuick.Layouts/StackLayout 1.3",
-            "QtQuick.Layouts/StackLayout 1.4",
-            "QtQuick.Layouts/StackLayout 1.7"
-        ]
-        exportMetaObjectRevisions: [11, 3, 4, 7]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "currentIndex"; type: "int" }
-        Method {
-            name: "itemAt"
-            type: "QQuickItem*"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-}