From 15e48b7387ae302a1b07a57b8374b097dc9c96a4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 Jul 2012 11:58:35 +0200 Subject: QtQuick1: Use new qWaitForWindowExposed/Active() functions. Change-Id: I020c82c465adaf6490a54871869bb6590542675f Reviewed-by: Jason McDonald --- .../declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp') 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(); -- cgit v1.2.3