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/qcombobox | |
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/qcombobox')
-rw-r--r-- | tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 96dce56b8b..ba3cf13271 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1977,7 +1977,7 @@ void tst_QComboBox::task190351_layout() list->addItem(QLatin1String("list") + QString::number(i)); listCombo.show(); - QTest::qWaitForWindowShown(&listCombo); + QVERIFY(QTest::qWaitForWindowExposed(&listCombo)); QTRY_VERIFY(listCombo.isVisible()); listCombo.setCurrentIndex(70); listCombo.showPopup(); @@ -2116,7 +2116,7 @@ void tst_QComboBox::task248169_popupWithMinimalSize() comboBox.setGeometry(desktopSize.width() - (desktopSize.width() / 4), (desktopSize.width() / 4), (desktopSize.width() / 2), (desktopSize.width() / 4)); comboBox.show(); - QTest::qWaitForWindowShown(&comboBox); + QVERIFY(QTest::qWaitForWindowExposed(&comboBox)); QTRY_VERIFY(comboBox.isVisible()); comboBox.showPopup(); QTRY_VERIFY(comboBox.view()); @@ -2436,8 +2436,8 @@ void tst_QComboBox::keyBoardNavigationWithMouse() combo.addItem( QString::number(i)); combo.show(); QApplication::setActiveWindow(&combo); - QTest::qWaitForWindowShown(&combo); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); + QVERIFY(QTest::qWaitForWindowActive(&combo)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); QCOMPARE(combo.currentText(), QLatin1String("0")); @@ -2502,7 +2502,7 @@ void tst_QComboBox::task_QTBUG_1071_changingFocusEmitsActivated() w.show(); QApplication::setActiveWindow(&w); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowActive(&w)); cb.clearEditText(); cb.setFocus(); QApplication::processEvents(); |