summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kukkonen <juha.kukkonen@nokia.com>2011-09-01 09:44:45 (GMT)
committerJuha Kukkonen <juha.kukkonen@nokia.com>2011-09-01 10:14:20 (GMT)
commit52df38bfba06358fbe8bf648e03eb0c95ceff114 (patch)
tree537b7341777a78c8482b0e75ec40e7196a31d9ac
parent126eeae15c4d4d6249e76bcea60a02da1f5407e5 (diff)
downloadQt-52df38bfba06358fbe8bf648e03eb0c95ceff114.zip
Qt-52df38bfba06358fbe8bf648e03eb0c95ceff114.tar.gz
Qt-52df38bfba06358fbe8bf648e03eb0c95ceff114.tar.bz2
Fix QColumnView auto test failure
Changed scrollTo test to wait until animation is finished before checking horizontalOffset. Task-number: QTTH-1461 Reviewed-by: Miikka Heikkinen
-rw-r--r--tests/auto/qcolumnview/tst_qcolumnview.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 7f6d43a..65e23bf 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -461,6 +461,7 @@ void tst_QColumnView::scrollTo()
view.setCurrentIndex(index);
QTest::qWait(ANIMATION_DELAY);
view.scrollTo(index, QAbstractItemView::EnsureVisible);
+ QTest::qWait(ANIMATION_DELAY);
index = index.parent();
if (start != level) {
if (!reverse)