diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-20 16:18:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 00:08:28 +0200 |
commit | 607c37befb145c3aa1b9d29365ac682a2bd3a55f (patch) | |
tree | df5203032be7ee9ef22558185a88b763ae00cdb5 /tests/auto/widgets/dialogs/qdialog | |
parent | d38fb0b535f3144dee4aa33c321e88d07f01add6 (diff) |
Remove usage of deprecated qWaitForWindowShown in dialog tests.
Change-Id: Id3ebe202d65ee682e8e2e3ae107808e9abb6cc15
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qdialog')
-rw-r--r-- | tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index c23ccc8618..99963ce9a5 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -524,23 +524,23 @@ void tst_QDialog::reject() { TestRejectDialog dialog; dialog.show(); - QTest::qWaitForWindowShown(&dialog); - QTRY_VERIFY(dialog.isVisible()); + QVERIFY(QTest::qWaitForWindowExposed(&dialog)); + QVERIFY(dialog.isVisible()); dialog.reject(); QTRY_VERIFY(!dialog.isVisible()); QCOMPARE(dialog.called, 1); dialog.show(); - QTest::qWaitForWindowShown(&dialog); - QTRY_VERIFY(dialog.isVisible()); + QVERIFY(QTest::qWaitForWindowExposed(&dialog)); + QVERIFY(dialog.isVisible()); QVERIFY(dialog.close()); QTRY_VERIFY(!dialog.isVisible()); QCOMPARE(dialog.called, 2); dialog.cancelReject = true; dialog.show(); - QTest::qWaitForWindowShown(&dialog); - QTRY_VERIFY(dialog.isVisible()); + QVERIFY(QTest::qWaitForWindowExposed(&dialog)); + QVERIFY(dialog.isVisible()); dialog.reject(); QTRY_VERIFY(dialog.isVisible()); QCOMPARE(dialog.called, 3); |