diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-20 12:49:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 07:24:49 +0200 |
| commit | 4677cf3d014d9b25c3516dd0e07a1a3fcd8af8e9 (patch) | |
| tree | d2e8f109b850c13346c85b6e3dca0077530ac45b /tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | |
| parent | a4cd6ef25df6a2a99626a0e97bfc239f68e7771f (diff) | |
Deprecate the qWaitForWindowShown(QWindow *) method.
While the qWaitForWindowShown(QWidget *) is inherited
from Qt 4.8, the qWaitForWindowShown(QWindow *) was introduced
in Qt 5. As it is identical to qWaitForWindowExposed()
and removed already, it can be deprecated in Qt 5.
Remove its usages in qtbase.
Change-Id: I28788d120ad687a49f02b2b44de6b38a2832fe5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp')
| -rw-r--r-- | tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 3adf2868be..ee5cb8efeb 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -1503,7 +1503,7 @@ void tst_QTouchEvent::testQGuiAppDelivery() QWindow *w = new QWindow; w->setGeometry(100, 100, 100, 100); w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); WindowTouchEventFilter filter; w->installEventFilter(&filter); @@ -1563,7 +1563,7 @@ void tst_QTouchEvent::testMultiDevice() QWindow *w = new QWindow; w->setGeometry(100, 100, 100, 100); w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); WindowTouchEventFilter filter; w->installEventFilter(&filter); |