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

 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 8 insertions, 2 deletions

diff --git a/examples/quick/views/listview/sections.qml b/examples/quick/views/listview/sections.qml
index 75b0f5c6d9..d51ed89789 100644
--- a/examples/quick/views/listview/sections.qml
+++ b/examples/quick/views/listview/sections.qml
@@ -87,8 +87,10 @@ Rectangle {
             height: childrenRect.height
             color: "lightsteelblue"
 
+            required property string section
+
             Text {
-                text: section
+                text: parent.section
                 font.bold: true
                 font.pixelSize: 20
             }
@@ -101,7 +103,11 @@ Rectangle {
         anchors.bottom: buttonBar.top
         width: parent.width
         model: animalsModel
-        delegate: Text { text: name; font.pixelSize: 18 }
+        delegate: Text {
+            required property string name
+            text: name
+            font.pixelSize: 18
+        }
 
         section.property: "size"
         section.criteria: ViewSection.FullString