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

 Conflicts:
	src/imports/qtqml/plugin.cpp
	src/qml/qml/qqml.h
	src/qml/qml/qqmlmetatype.cpp
	src/qml/qml/qqmlmetatype_p.h
	src/qml/qml/qqmltypeloader.cpp
	src/qml/types/qqmlbind.cpp
	src/quick/items/qquickitemsmodule.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: I52548938a582cb6510271ed4bc3a9aa0c3c11df6

4 files changed, 12 insertions, 5 deletions

diff --git a/examples/quick/shared/FlickrRssModel.qml b/examples/quick/shared/FlickrRssModel.qml
index 5f88fabcae..2fb4412ba1 100644
--- a/examples/quick/shared/FlickrRssModel.qml
+++ b/examples/quick/shared/FlickrRssModel.qml
@@ -72,7 +72,7 @@ ListModel {
                 var jsonText = xhr.responseText;
                 var objArray = JSON.parse(jsonText.replace(/\'/g,"'"))
                 if (objArray.errors !== undefined)
-                    console.log(lCategory, "Error fetching tweets: " + imageItems.errors[0].message)
+                    console.log("Error fetching tweets: " + objArray.errors[0].message)
                 else {
                     for (var key in objArray.items) {
                         var rssItem = objArray.items[key];
diff --git a/examples/quick/shared/LauncherList.qml b/examples/quick/shared/LauncherList.qml
index f6001cc681..cb13ec4372 100644
--- a/examples/quick/shared/LauncherList.qml
+++ b/examples/quick/shared/LauncherList.qml
@@ -48,6 +48,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+import QtQml 2.12
+import QtQml.Models 2.12
 import QtQuick 2.12
 
 Rectangle {
diff --git a/examples/quick/shared/SimpleLauncherDelegate.qml b/examples/quick/shared/SimpleLauncherDelegate.qml
index 097954cb89..11d34a187e 100644
--- a/examples/quick/shared/SimpleLauncherDelegate.qml
+++ b/examples/quick/shared/SimpleLauncherDelegate.qml
@@ -58,6 +58,9 @@ Rectangle {
     width: ListView.view.width
     height: button.implicitHeight + 22
 
+    required property string name
+    required property string description
+
     signal clicked()
 
     gradient: Gradient {
diff --git a/examples/quick/shared/TabSet.qml b/examples/quick/shared/TabSet.qml
index 9e2759c3ec..ab8476ad44 100644
--- a/examples/quick/shared/TabSet.qml
+++ b/examples/quick/shared/TabSet.qml
@@ -78,6 +78,7 @@ Item {
         Repeater {
             model: stack.children.length
             delegate: Rectangle {
+                required property int index
                 width: tabWidget.width / stack.children.length
                 height: Math.max(Screen.pixelDensity * 7, label.implicitHeight * 1.2)
 
@@ -90,18 +91,18 @@ Item {
                     anchors { fill: parent; leftMargin: 2; topMargin: 5; rightMargin: 1 }
                     border { left: 7; right: 7 }
                     source: "images/tab.png"
-                    visible: tabWidget.current == index
+                    visible: tabWidget.current == parent.index
                 }
                 Text {
                     id: label
                     horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter
                     anchors.fill: parent
-                    text: stack.children[index].title
+                    text: stack.children[parent.index].title
                     elide: Text.ElideRight
-                    font.bold: tabWidget.current == index
+                    font.bold: tabWidget.current == parent.index
                 }
                 TapHandler {
-                    onTapped: tabWidget.current = index
+                    onTapped: tabWidget.current = parent.index
                 }
             }
         }