From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Wed, 23 Jan 2013 17:27:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=44b7d97d565677d6decbef2d010709bdb3d7cbd4;p=konrad%2Fqtdeclarative.git

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

Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
---

44b7d97d565677d6decbef2d010709bdb3d7cbd4
diff --cc tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index a78625c,8821203..65fef9a
--- a/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;