diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-16 04:42:20 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-16 04:42:20 (GMT) |
| commit | 5c87831d2d87925e0593afedd450715c15063a6c (patch) | |
| tree | 6dde0b2c31db826e4a36c432cb5e88b0aa9ae00a /tests | |
| parent | 43d7624e7e8212a265e06d31ad254f9491512625 (diff) | |
| download | Qt-5c87831d2d87925e0593afedd450715c15063a6c.zip Qt-5c87831d2d87925e0593afedd450715c15063a6c.tar.gz Qt-5c87831d2d87925e0593afedd450715c15063a6c.tar.bz2 | |
Test delegate being set before model.
Diffstat (limited to 'tests')
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml index d9e9f27..32833d2 100644 --- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml +++ b/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml @@ -45,7 +45,7 @@ Rectangle { currentIndex: 5 cellWidth: 80 cellHeight: 60 - model: testModel delegate: myDelegate + model: testModel } } diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp index d09aad7..d0b7462 100644 --- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp +++ b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp @@ -390,7 +390,11 @@ void tst_QmlGraphicsGridView::removed() gridview->setViewportY(120); gridview->setCurrentIndex(10); + // let transitions settle. + QTest::qWait(300); + model.removeItem(1); + // let transitions settle. QTest::qWait(300); diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml index 65a9d8a..74f5ef4 100644 --- a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml +++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml @@ -43,8 +43,8 @@ Rectangle { width: 240 height: 320 keyNavigationWraps: testWrap - model: testModel delegate: myDelegate highlightMoveSpeed: 1000 + model: testModel } } |