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

Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952

diff --cc tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index a78625c,8821203..65fef9a
--- 1/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
--- 2/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@@ -1352,8 -1371,22 +1353,21 @@@ void tst_QQuickPathView::emptyModel(
  
      QCOMPARE(pathview->offset(), qreal(0.0));
  
 -    delete window;
  }
  
+ 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;

diff --cc tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Simple merge