From 305cdc7355c4b021cfe54c710aa92a88e12fe188 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 30 Jul 2012 12:36:02 +0200 Subject: Remove usage of deprecated qWaitForWindowShown(QWidget *) method. Change-Id: I445d24a09dbb7abb62a37bd9914284f21a4f08f1 Reviewed-by: Rohan McGovern --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/widgets/qmenubar') diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index 5a2cf0f316..a9590ca2f2 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -241,8 +241,8 @@ void tst_QMenuBar::initTestCase() initSimpleMenubar(); mw->show(); - QTest::qWaitForWindowShown(mw); mw->activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(mw)); menu1 = new QtTestSlot( mw ); menu2 = new QtTestSlot( mw ); @@ -1239,11 +1239,11 @@ void tst_QMenuBar::taskQTBUG4965_escapeEaten() menu.addAction("quit", &menubar, SLOT(close()), QKeySequence("ESC")); menubar.show(); QApplication::setActiveWindow(&menubar); - QTest::qWaitForWindowShown(&menubar); + QVERIFY(QTest::qWaitForWindowExposed(&menubar)); menubar.setActiveAction(first); QTRY_VERIFY(menu.isVisible()); QCOMPARE(menubar.activeAction(), first); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QTest::keyClick(static_cast(0), Qt::Key_Escape); QVERIFY(!menu.isVisible()); QTRY_VERIFY(menubar.hasFocus()); -- cgit v1.2.3