Merge remote-tracking branch 'origin/release' into stable

Change-Id: I1214586499ab2876c8bc55a99367a0c938c8b919

2 files changed, 58 insertions, 0 deletions

diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
index 0589e7c46b..03be57909f 100644
--- a/tests/auto/qmltest/listview/tst_listview.qml
+++ b/tests/auto/qmltest/listview/tst_listview.qml
@@ -102,6 +102,23 @@ Item {
         }
     }
 
+    ListView {
+        id: listViewDelegateModelAfterCreate
+        anchors.fill: parent
+        property int createdDelegates: 0
+    }
+
+    Component {
+        id: delegateModelAfterCreateComponent
+        Rectangle {
+            width: 140
+            height: 140
+            border.color: "black"
+            color: "red"
+            Component.onCompleted: listViewDelegateModelAfterCreate.createdDelegates++;
+        }
+    }
+
     ListModel { id: emptymodel }
     ListModel { id: manyitems }
     ListModel { id: firstmodel; ListElement { name: "FirstModelElement0" } }
@@ -249,5 +266,11 @@ Item {
                 asyncListViewLoaderView.currentIndex = 4;
             }
         }
+
+        function test_set_delegate_model_after_list_creation() {
+            listViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
+            listViewDelegateModelAfterCreate.model = 40;
+            verify(listViewDelegateModelAfterCreate.createdDelegates > 0);
+        }
     }
 }
diff --git a/tests/auto/qmltest/pathview/tst_pathview.qml b/tests/auto/qmltest/pathview/tst_pathview.qml
new file mode 100644
index 0000000000..820034c960
--- /dev/null
+++ b/tests/auto/qmltest/pathview/tst_pathview.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.1
+import QtTest 1.0
+
+Item {
+    id: top
+
+    PathView {
+        id: pathViewDelegateModelAfterCreate
+        anchors.fill: parent
+        property int createdDelegates: 0
+        path: Path { startX: 120; startY: 100 }
+    }
+
+    Component {
+        id: delegateModelAfterCreateComponent
+        Rectangle {
+            width: 140
+            height: 140
+            border.color: "black"
+            color: "red"
+            Component.onCompleted: pathViewDelegateModelAfterCreate.createdDelegates++;
+        }
+    }
+
+    TestCase {
+        name: "PathView"
+        when: windowShown
+
+        function test_set_delegate_model_after_path_creation() {
+            pathViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
+            pathViewDelegateModelAfterCreate.model = 40;
+            verify(pathViewDelegateModelAfterCreate.createdDelegates > 0);
+        }
+    }
+}