diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-17 11:58:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 11:43:41 +0200 |
| commit | 15e48b7387ae302a1b07a57b8374b097dc9c96a4 (patch) | |
| tree | d50a7680b1ebd99bacd944408f054d2ec61a3a4f /tests/auto/declarative/qdeclarativelistview | |
| parent | 8c5d903d9c7c3ffe1113609a712943fb7c7398ad (diff) | |
QtQuick1: Use new qWaitForWindowExposed/Active() functions.
Change-Id: I020c82c465adaf6490a54871869bb6590542675f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativelistview')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp | 7 |
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(); |