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

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

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

2 files changed, 12 insertions, 10 deletions

diff --git a/examples/quick/models/stringlistmodel/main.cpp b/examples/quick/models/stringlistmodel/main.cpp
index 6b4db422a6..d9de69b3aa 100644
--- a/examples/quick/models/stringlistmodel/main.cpp
+++ b/examples/quick/models/stringlistmodel/main.cpp
@@ -68,15 +68,15 @@ int main(int argc, char ** argv)
     QGuiApplication app(argc, argv);
 
 //![0]
-    QStringList dataList;
-    dataList.append("Item 1");
-    dataList.append("Item 2");
-    dataList.append("Item 3");
-    dataList.append("Item 4");
+    QStringList dataList = {
+        "Item 1",
+        "Item 2",
+        "Item 3",
+        "Item 4"
+    };
 
     QQuickView view;
-    QQmlContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+    view.setInitialProperties({{ "model", QVariant::fromValue(dataList) }});
 //![0]
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/quick/models/stringlistmodel/view.qml b/examples/quick/models/stringlistmodel/view.qml
index f74b7db1c1..e392284d0f 100644
--- a/examples/quick/models/stringlistmodel/view.qml
+++ b/examples/quick/models/stringlistmodel/view.qml
@@ -52,13 +52,15 @@ import QtQuick 2.0
 //![0]
 
 ListView {
-    width: 100; height: 100
+    width: 100
+    height: 100
+    required model
 
-    model: myModel
     delegate: Rectangle {
+        required property string modelData
         height: 25
         width: 100
-        Text { text: modelData }
+        Text { text: parent.modelData }
     }
 }
 //![0]