1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index daecf507..bdf092e2 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1227,11 +1227,8 @@ void tst_QDeclarativeListView::currentIndex()
     // Test keys
     canvas->show();
     qApp->setActiveWindow(canvas);
-#ifdef Q_WS_X11
-    // to be safe and avoid failing setFocus with window managers
-    qt_x11_wait_for_window_manager(canvas);
-#endif
-    QTRY_VERIFY(canvas->hasFocus());
+    QVERIFY(QTest::qWaitForWindowActive(canvas));
+    QVERIFY(canvas->hasFocus());
     QTRY_VERIFY(canvas->scene()->hasFocus());
     qApp->processEvents();