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/qdeclarativefocusscope | |
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/qdeclarativefocusscope')
-rw-r--r-- | tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index 5abf38f9..a0814901 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -113,12 +113,7 @@ void tst_qdeclarativefocusscope::basic() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); @@ -160,13 +155,7 @@ void tst_qdeclarativefocusscope::nested() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif - + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); @@ -194,12 +183,7 @@ void tst_qdeclarativefocusscope::noFocus() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); @@ -239,12 +223,7 @@ void tst_qdeclarativefocusscope::textEdit() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); @@ -298,12 +277,7 @@ void tst_qdeclarativefocusscope::forceFocus() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); @@ -364,12 +338,7 @@ void tst_qdeclarativefocusscope::signalEmission() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QVERIFY(QTest::qWaitForWindowActive(view)); QVariant blue(QColor("blue")); QVariant red(QColor("red")); @@ -417,13 +386,7 @@ void tst_qdeclarativefocusscope::qtBug13380() view->show(); QVERIFY(view->rootObject()); qApp->setActiveWindow(view); - qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif - + QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->hasFocus()); QVERIFY(view->scene()->hasFocus()); QVERIFY(view->rootObject()->property("noFocus").toBool()); |