diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-30 12:36:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 13:26:03 +0200 |
commit | 305cdc7355c4b021cfe54c710aa92a88e12fe188 (patch) | |
tree | 0d141f080278556d3ed454f92a5cba6012a2a5b4 /tests/auto/widgets/widgets/qmenubar | |
parent | 0838ac541d38b33b23955c036bbcfd94ccc19066 (diff) |
Remove usage of deprecated qWaitForWindowShown(QWidget *) method.
Change-Id: I445d24a09dbb7abb62a37bd9914284f21a4f08f1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmenubar')
-rw-r--r-- | tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QWidget *>(0), Qt::Key_Escape); QVERIFY(!menu.isVisible()); QTRY_VERIFY(menubar.hasFocus()); |