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

Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952

2 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickpathview/data/emptypath.qml b/tests/auto/quick/qquickpathview/data/emptypath.qml
new file mode 100644
index 0000000000..d68cf4491b
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/emptypath.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+PathView {
+    model: 1
+    delegate: Item {}
+}
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index a78625c58e..65fef9abe5 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -118,6 +118,7 @@ private slots:
     void pathUpdateOnStartChanged();
     void package();
     void emptyModel();
+    void emptyPath();
     void closed();
     void pathUpdate();
     void visualDataModel();
@@ -1354,6 +1355,19 @@ void tst_QQuickPathView::emptyModel()
 
 }
 
+void tst_QQuickPathView::emptyPath()
+{
+    QQuickView *window = createView();
+
+    window->setSource(testFileUrl("emptypath.qml"));
+    qApp->processEvents();
+
+    QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
+    QVERIFY(pathview != 0);
+
+    delete window;
+}
+
 void tst_QQuickPathView::closed()
 {
     QQmlEngine engine;