diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 18:27:44 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 18:28:44 +0100 |
commit | 44b7d97d565677d6decbef2d010709bdb3d7cbd4 (patch) | |
tree | 853e6504899a735ff2ea02df54cf7acd07fde52f /tests | |
parent | 40574b466a5773fdb7ccddded45e237df375d848 (diff) | |
parent | 742cff521a366e907ceddbd441b8a34101e58d01 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickpathview/data/emptypath.qml | 6 | ||||
-rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 14 | ||||
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 |
3 files changed, 21 insertions, 1 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; diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 5b2ac2525e..0139e156c3 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2329,7 +2329,7 @@ void tst_qquicktextedit::cursorDelegate() void tst_qquicktextedit::remoteCursorDelegate() { TestHTTPServer server(SERVER_PORT); - server.serveDirectory(dataDirectory()); + server.serveDirectory(dataDirectory(), TestHTTPServer::Delay); QQuickView view; |