From 3a4b8cbc3d5aade82e73b41cac01056e818a38d9 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 19 Mar 2014 15:59:52 +0100 Subject: 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 --- tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') 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); -- cgit v1.2.3