diff options
Diffstat (limited to 'tests/auto/widgets/widgets')
18 files changed, 56 insertions, 58 deletions
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index c77358faf8..5148e0a455 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -166,7 +166,7 @@ void tst_QButtonGroup::arrowKeyNavigation() dlg.show(); qApp->setActiveWindow(&dlg); - QTest::qWaitForWindowShown(&dlg); + QVERIFY(QTest::qWaitForWindowActive(&dlg)); bt1.setFocus(); @@ -386,7 +386,7 @@ void tst_QButtonGroup::task106609() buttons->addButton(radio3, 3); vbox->addWidget(radio3); dlg.show(); - QTest::qWaitForWindowShown(&dlg); + QVERIFY(QTest::qWaitForWindowExposed(&dlg)); qRegisterMetaType<QAbstractButton*>("QAbstractButton*"); QSignalSpy spy1(buttons, SIGNAL(buttonClicked(QAbstractButton*))); diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp index 1b48278b0a..678dcff873 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp @@ -177,8 +177,8 @@ void tst_QCalendarWidget::buttonClickCheck() QSize size = object.sizeHint(); object.setGeometry(0,0,size.width(), size.height()); object.show(); - QTest::qWaitForWindowShown(&object); object.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&object)); QDate selectedDate(2005, 1, 1); //click on the month buttons @@ -332,7 +332,7 @@ void tst_QCalendarWidget::showPrevNext() QCalendarWidget calWidget; calWidget.show(); - QTest::qWaitForWindowShown(&calWidget); + QVERIFY(QTest::qWaitForWindowExposed(&calWidget)); if(!dateOrigin.isNull()) { calWidget.setSelectedDate(dateOrigin); calWidget.setCurrentPage(dateOrigin.year(), dateOrigin.month()); 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(); diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index ae776f536b..6dd1f0d033 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -584,7 +584,7 @@ void tst_QCommandLinkButton::heightForWithWithIcon() layout->addStretch(); mainWin.setLayout(layout); mainWin.showMaximized(); - QTest::qWaitForWindowShown(&mainWin); + QVERIFY(QTest::qWaitForWindowExposed(&mainWin)); QVERIFY(largeIconButton->height() > 68); //enough room for the icon } diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 494ba548c1..018ddbd5b2 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -825,7 +825,7 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged() { QDockWidget dock; dock.show(); - QTest::qWaitForWindowShown(&dock); + QVERIFY(QTest::qWaitForWindowExposed(&dock)); QDockWidgetLayout *l = qobject_cast<QDockWidgetLayout*>(dock.layout()); @@ -850,10 +850,10 @@ void tst_QDockWidget::taskQTBUG_9758_undockedGeometry() dock1.hide(); dock2.hide(); window.show(); - QTest::qWaitForWindowShown(&window); + QVERIFY(QTest::qWaitForWindowExposed(&window)); dock1.setFloating(true); dock1.show(); - QTest::qWaitForWindowShown(&dock1); + QVERIFY(QTest::qWaitForWindowExposed(&dock1)); QVERIFY(dock1.x() >= 0); QVERIFY(dock1.y() >= 0); diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index 19ff947a1c..2f17f52a35 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -403,7 +403,7 @@ void tst_QLabel::task226479_movieResize() label.show(); QMovie *movie = new QMovie( &label ); label.setMovie(movie); - QTest::qWaitForWindowShown(&label); + QVERIFY(QTest::qWaitForWindowExposed(&label)); movie->setFileName(QFINDTESTDATA("red.png")); movie->start(); QTest::qWait(50); @@ -478,7 +478,7 @@ void tst_QLabel::unicodeText() layout->setMargin(8); frame.setLayout(layout); frame.show(); - QTest::qWaitForWindowShown(&frame); + QVERIFY(QTest::qWaitForWindowExposed(&frame)); QVERIFY(frame.isVisible()); // was successfully sized and shown testWidget->show(); } @@ -519,7 +519,7 @@ void tst_QLabel::mnemonic() hbox->addWidget(new QLineEdit); w.setLayout(hbox); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QLabelPrivate *d = static_cast<QLabelPrivate *>(QObjectPrivate::get(lab)); QVERIFY(d->control); @@ -555,7 +555,7 @@ void tst_QLabel::taskQTBUG_7902_contextMenuCrash() QLabel *w = new QLabel("Test or crash?"); w->setTextInteractionFlags(Qt::TextSelectableByMouse); w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); QTimer ti; w->connect(&ti, SIGNAL(timeout()), w, SLOT(deleteLater())); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 48ff37a448..956f970b85 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -368,7 +368,7 @@ void tst_QLineEdit::initTestCase() testWidget->resize(200,50); testWidget->show(); - QTest::qWaitForWindowShown(testWidget); + QVERIFY(QTest::qWaitForWindowExposed(testWidget)); QApplication::setActiveWindow(testWidget); QTRY_VERIFY(testWidget->hasFocus()); @@ -3362,7 +3362,7 @@ void tst_QLineEdit::task174640_editingFinished() testMenu1->addAction("foo"); testMenu1->addAction("bar"); testMenu1->show(); - QTest::qWaitForWindowShown(testMenu1); + QVERIFY(QTest::qWaitForWindowExposed(testMenu1)); QTest::qWait(20); mw.activateWindow(); @@ -3374,7 +3374,7 @@ void tst_QLineEdit::task174640_editingFinished() testMenu2->addAction("foo2"); testMenu2->addAction("bar2"); testMenu2->show(); - QTest::qWaitForWindowShown(testMenu2); + QVERIFY(QTest::qWaitForWindowExposed(testMenu2)); QTest::qWait(20); mw.activateWindow(); delete testMenu2; @@ -3431,8 +3431,8 @@ void tst_QLineEdit::task210502_caseInsensitiveInlineCompletion() completer.setCompletionMode(QCompleter::InlineCompletion); lineEdit.setCompleter(&completer); lineEdit.show(); - QTest::qWaitForWindowShown(&lineEdit); QApplication::setActiveWindow(&lineEdit); + QVERIFY(QTest::qWaitForWindowActive(&lineEdit)); lineEdit.setFocus(); QTRY_VERIFY(lineEdit.hasFocus()); QTest::keyPress(&lineEdit, 'a'); @@ -3616,7 +3616,7 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash() // Would pass before the associated commit, but left as a guard. QLineEdit *w = new QLineEdit; w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); QTimer ti; w->connect(&ti, SIGNAL(timeout()), w, SLOT(deleteLater())); @@ -3667,7 +3667,7 @@ void tst_QLineEdit::QTBUG697_paletteCurrentColorGroup() le.show(); QApplication::setActiveWindow(&le); - QTest::qWaitForWindowShown(&le); + QVERIFY(QTest::qWaitForWindowActive(&le)); le.setFocus(); QTRY_VERIFY(le.hasFocus()); le.selectAll(); @@ -3685,7 +3685,7 @@ void tst_QLineEdit::QTBUG13520_textNotVisible() LineEdit le; le.setAlignment( Qt::AlignRight | Qt::AlignVCenter); le.show(); - QTest::qWaitForWindowShown(&le); + QVERIFY(QTest::qWaitForWindowExposed(&le)); le.setText("01-ST16-01SIL-MPL001wfgsdfgsdgsdfgsdfgsdfgsdfgsdfg"); le.setCursorPosition(0); QTest::qWait(100); //just make sure we get he lineedit correcly painted @@ -3714,7 +3714,7 @@ void tst_QLineEdit::QTBUG7174_inputMaskCursorBlink() edit.setText(QLatin1String("AAAA")); edit.show(); QRect cursorRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); - QTest::qWaitForWindowShown(&edit); + QVERIFY(QTest::qWaitForWindowExposed(&edit)); edit.updateRegion = QRegion(); QTest::qWait(QApplication::cursorFlashTime()); QVERIFY(edit.updateRegion.contains(cursorRect)); diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index c6a039cb37..6dc049bc3b 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1684,7 +1684,7 @@ void tst_QMainWindow::QTBUG2774_stylechange() mw.setCentralWidget(central); dockw->resize(10,10); mw.show(); - QTest::qWaitForWindowShown(&mw); + QVERIFY(QTest::qWaitForWindowExposed(&mw)); int centralOriginalWidth = central->width(); QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() - 3))); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 0a66571894..a6880bc897 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -636,7 +636,7 @@ void tst_QMdiArea::changeWindowTitle() mw->setCentralWidget( ws ); mw->menuBar(); mw->show(); - QTest::qWaitForWindowShown(mw); + QVERIFY(QTest::qWaitForWindowExposed(mw)); QWidget *widget = new QWidget( ws ); widget->setWindowTitle( wc ); @@ -656,8 +656,7 @@ void tst_QMdiArea::changeWindowTitle() mw->hide(); qApp->processEvents(); mw->show(); - qApp->processEvents(); - QTest::qWaitForWindowShown(mw); + QVERIFY(QTest::qWaitForWindowExposed(mw)); #if !defined(Q_OS_MAC) && !defined(Q_OS_WINCE) QTRY_COMPARE( mw->windowTitle(), QString::fromLatin1("%1 - [%2]").arg(mwc).arg(wc) ); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 98a3675422..614bb158c6 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -985,7 +985,7 @@ void tst_QMdiSubWindow::setSystemMenu() mainWindow.setCentralWidget(mdiArea); mainWindow.menuBar(); mainWindow.show(); - QTest::qWaitForWindowShown(&mainWindow); + QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); QTest::qWait(60); @@ -1626,7 +1626,7 @@ void tst_QMdiSubWindow::resizeTimer() QMdiArea mdiArea; QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QWidget); mdiArea.show(); - QTest::qWaitForWindowShown(&mdiArea); + QVERIFY(QTest::qWaitForWindowExposed(&mdiArea)); QTest::qWait(300); diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 40985c00cb..a61e34f898 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -429,10 +429,10 @@ void tst_QMenu::overrideMenuAction() m->addAction(aQuit); w.show(); - QTest::qWaitForWindowShown(&w); QApplication::setActiveWindow(&w); w.setFocus(); - QTRY_VERIFY(w.hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(&w)); + QVERIFY(w.hasFocus()); //test of the action inside the menu QTest::keyClick(&w, Qt::Key_X, Qt::ControlModifier); @@ -467,7 +467,7 @@ void tst_QMenu::statusTip() w.addToolBar(&tb); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QRect rect1 = tb.actionGeometry(&a); QToolButton *btn = qobject_cast<QToolButton*>(tb.childAt(rect1.center())); @@ -583,20 +583,20 @@ void tst_QMenu::layoutDirection() QMenu menu(&win); menu.show(); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QCOMPARE(menu.layoutDirection(), Qt::RightToLeft); menu.close(); menu.setParent(0); menu.show(); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QCOMPARE(menu.layoutDirection(), QApplication::layoutDirection()); menu.close(); //now the menubar QAction *action = win.menuBar()->addMenu(&menu); win.menuBar()->setActiveAction(action); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QCOMPARE(menu.layoutDirection(), Qt::RightToLeft); } @@ -784,7 +784,7 @@ void tst_QMenu::task258920_mouseBorder() QAction *action = menu.addAction("test"); menu.popup(QApplication::desktop()->availableGeometry().center()); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QTest::qWait(100); QRect actionRect = menu.actionGeometry(action); QTest::mouseMove(&menu, actionRect.center()); @@ -834,7 +834,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow() desiredGeometry.moveTopLeft(QPoint(10, screen.bottom()-b.height()-5)); b.setGeometry(desiredGeometry); - QTest::qWaitForWindowShown(&b); + QVERIFY(QTest::qWaitForWindowExposed(&b)); if (b.geometry() != desiredGeometry) { // We are trying to put the button very close to the edge of the screen, @@ -868,7 +868,7 @@ void tst_QMenu::QTBUG7907_submenus_autoselect() menu.addMenu(&set1); menu.addMenu(&set2); menu.show(); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); QTest::mouseClick(&menu, Qt::LeftButton, Qt::NoModifier, QPoint(5,5) ); QTest::qWait(500); QVERIFY(!subset.isVisible()); @@ -883,7 +883,7 @@ void tst_QMenu::QTBUG7411_submenus_activate() sub1.setTitle("&sub1"); QAction *act1 = menu.addMenu(&sub1); menu.show(); - QTest::qWaitForWindowShown(&menu); + QVERIFY(QTest::qWaitForWindowExposed(&menu)); menu.setActiveAction(act); QTest::keyPress(&menu, Qt::Key_Down); QCOMPARE(menu.activeAction(), act1); @@ -906,7 +906,7 @@ public: { m_currentIndex = index; popup(QPoint()); - QTest::qWaitForWindowShown(this); + QVERIFY(QTest::qWaitForWindowExposed(this)); setActiveAction(dialogActions[index]); QTimer::singleShot(500, this, SLOT(checkVisibility())); QTest::keyClick(this, Qt::Key_Enter); //activation 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()); diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index 84e3acb346..f560b6a84b 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp @@ -165,7 +165,7 @@ void tst_QProgressBar::format() bar.setRange(0, 10); bar.setValue(1); bar.show(); - QTest::qWaitForWindowShown(&bar); + QVERIFY(QTest::qWaitForWindowExposed(&bar)); QTest::qWait(20); bar.repainted = false; @@ -201,7 +201,7 @@ void tst_QProgressBar::setValueRepaint() pbar.setMaximum(10); pbar.setFormat("%v"); pbar.show(); - QTest::qWaitForWindowShown(&pbar); + QVERIFY(QTest::qWaitForWindowExposed(&pbar)); QApplication::processEvents(); for (int i = pbar.minimum(); i < pbar.maximum(); ++i) { diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 13da4430c2..32b7ffe2b0 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -746,7 +746,7 @@ void tst_QSpinBox::editingFinished() testFocusWidget->show(); QApplication::setActiveWindow(testFocusWidget); - QTest::qWaitForWindowShown(testFocusWidget); + QVERIFY(QTest::qWaitForWindowActive(testFocusWidget)); box->activateWindow(); box->setFocus(); @@ -971,7 +971,7 @@ void tst_QSpinBox::sizeHint() sizeHint_SpinBox *spinBox = new sizeHint_SpinBox; layout->addWidget(spinBox); widget->show(); - QTest::qWaitForWindowShown(widget); + QVERIFY(QTest::qWaitForWindowExposed(widget)); // Prefix spinBox->sizeHintRequests = 0; @@ -1023,8 +1023,8 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate() spinbox.activateWindow(); spinbox.setFocus(); QApplication::setActiveWindow(&spinbox); - QTest::qWaitForWindowShown(&spinbox); - QTRY_VERIFY(spinbox.hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(&spinbox)); + QVERIFY(spinbox.hasFocus()); QTRY_COMPARE(static_cast<QWidget *>(&spinbox), QApplication::activeWindow()); QCOMPARE(spinbox.text(), spinbox.locale().toString(spinbox.value())); spinbox.lineEdit()->setCursorPosition(2); //just after the first thousand separator diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 0757dd9ba4..50536c84fb 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -644,7 +644,7 @@ void tst_QTabBar::taskQTBUG_10052_widgetLayoutWhenMoving() tabBar.setTabButton(1, QTabBar::RightSide, &w2); tabBar.show(); - QTest::qWaitForWindowShown(&tabBar); + QVERIFY(QTest::qWaitForWindowExposed(&tabBar)); w1.moved = w2.moved = false; tabBar.moveTab(0, 1); QTRY_VERIFY(w1.moved); diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index d68e2adc19..350df0868c 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -612,7 +612,7 @@ void tst_QTabWidget::minimumSizeHint() tw.addTab(page, QLatin1String("page1")); tw.show(); - QTest::qWaitForWindowShown(&tw); + QVERIFY(QTest::qWaitForWindowExposed(&tw)); tw.resize(tw.minimumSizeHint()); QSize minSize = label->minimumSizeHint(); @@ -660,7 +660,7 @@ void tst_QTabWidget::heightForWidth() window->resize(160, h); window->show(); - QTest::qWaitForWindowShown(window); + QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(label->height() >= label->heightForWidth(label->width())); delete window; diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index e5392249a9..0d04f69abe 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -55,11 +55,10 @@ public: inline TestBrowser() : htmlLoadAttempts(0) { show(); QApplication::setActiveWindow(this); - QTest::qWaitForWindowShown(this); activateWindow(); setFocus(); - QTest::qWait(50); - QTRY_VERIFY(hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(this)); + QVERIFY(hasFocus()); } virtual QVariant loadResource(int type, const QUrl &name); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index f14c4e0d52..846bb41181 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2236,7 +2236,7 @@ void tst_QTextEdit::taskQTBUG_7902_contextMenuCrash() { QTextEdit *w = new QTextEdit; w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); QTimer ti; w->connect(&ti, SIGNAL(timeout()), w, SLOT(deleteLater())); |