diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-15 06:23:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-15 06:23:57 (GMT) |
| commit | b43b430b0668d145e31fd0445ed9d272270a576c (patch) | |
| tree | 0cc28e21844da6d8717c9e47a51428a89e12d4b3 /tests/auto/qtreeview | |
| parent | 8cad28ef7abf92cab034ae3586e24cd0b8be38a2 (diff) | |
| parent | 7c6bc5a25d11a9d455b5bf96cb5229f78790db3a (diff) | |
| download | Qt-b43b430b0668d145e31fd0445ed9d272270a576c.zip Qt-b43b430b0668d145e31fd0445ed9d272270a576c.tar.gz Qt-b43b430b0668d145e31fd0445ed9d272270a576c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/qtreeview')
| -rw-r--r-- | tests/auto/qtreeview/tst_qtreeview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index fae4b26..f42d5f6 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -3354,7 +3354,7 @@ void tst_QTreeView::task246536_scrollbarsNotWorking() o.count = 0; tree.verticalScrollBar()->setValue(50); QTest::qWait(100); - QVERIFY(o.count > 0); + QTRY_VERIFY(o.count > 0); } void tst_QTreeView::task250683_wrongSectionSize() @@ -3404,8 +3404,9 @@ void tst_QTreeView::task239271_addRowsWithFirstColumnHidden() QStandardItem sub1("sub1"), sub11("sub11"); root0.appendRow(QList<QStandardItem*>() << &sub1 << &sub11); - QTest::qWait(200); + QTest::qWait(20); //items in the 2nd column should have been painted + QTRY_VERIFY(!delegate.paintedIndexes.isEmpty()); QVERIFY(delegate.paintedIndexes.contains(sub00.index())); QVERIFY(delegate.paintedIndexes.contains(sub11.index())); } |