summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-03-19 15:59:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-19 19:50:50 +0100
commit3a4b8cbc3d5aade82e73b41cac01056e818a38d9 (patch)
tree863095eb86737efcad73f380d210631a027968b1 /tests
parentb66950b342417d38b2f2992053b58ef59a84400b (diff)
Fix tst_QColumnView::scrollTo()
The test relies on active focus, so activate the test window in the beginning of the test to avoid undesired focus widget changes by QApplication::setActiveWindow() during the test. Task-number: QTBUG-36395 Change-Id: I6febec7d552224b1754aaf57520ed6d435d29563 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 1ed33b9233..ebfc5751e7 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -411,7 +411,10 @@ void tst_QColumnView::scrollTo()
ColumnView view(&topLevel);
view.resize(200, 200);
topLevel.show();
+ topLevel.activateWindow();
centerOnScreen(&topLevel);
+ QVERIFY(QTest::qWaitForWindowActive(&topLevel));
+
view.scrollTo(QModelIndex(), QAbstractItemView::EnsureVisible);
QCOMPARE(view.HorizontalOffset(), 0);