diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
| commit | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (patch) | |
| tree | 70df9d393d3b6946178378560834239c81fdabf0 /tests/auto/qlistview/tst_qlistview.cpp | |
| parent | 86b4c125372f02c21be81fff376817852c28afa9 (diff) | |
| parent | 2e16dff13d260e8ba07534b36ac635c9e625e442 (diff) | |
| download | Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.zip Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.gz Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to 'tests/auto/qlistview/tst_qlistview.cpp')
| -rw-r--r-- | tests/auto/qlistview/tst_qlistview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index b51434f..d9cab02 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -59,6 +59,8 @@ #include <windows.h> #endif +#include "../../shared/util.h" + //TESTED_CLASS= //TESTED_FILES= @@ -1630,7 +1632,9 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates() } delegate; list.setItemDelegate(&delegate); - QTest::qWait(200); //makes sure the layout is done + delegate.numPaints = 0; + QTest::qWaitForWindowShown(&list); //makes sure the layout is done + QTRY_VERIFY(delegate.numPaints > 0); const QPoint topLeft(-6, 0); list.setPositionForIndex(topLeft, index); |