diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
8 files changed, 144 insertions, 151 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index c292e0feeb..41ef60f7d3 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -1559,7 +1559,7 @@ void tst_QGraphicsItem::selected() view.setFixedSize(250, 250); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); qApp->processEvents(); qApp->processEvents(); @@ -1688,7 +1688,7 @@ void tst_QGraphicsItem::selected_textItem() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(20); QTRY_VERIFY(!text->isSelected()); @@ -3369,7 +3369,7 @@ void tst_QGraphicsItem::childrenBoundingRect() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(30); QCOMPARE(parent->childrenBoundingRect(), QRectF(-500, -100, 600, 800)); @@ -3470,7 +3470,7 @@ void tst_QGraphicsItem::childrenBoundingRect4() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Try to mess up the cached bounding rect. rect->childrenBoundingRect(); @@ -3494,7 +3494,7 @@ void tst_QGraphicsItem::childrenBoundingRect5() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Try to mess up the cached bounding rect. QRectF expectedChildrenBoundingRect = parent->boundingRect(); @@ -3529,8 +3529,7 @@ void tst_QGraphicsItem::group() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); - QApplication::processEvents(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QGraphicsItemGroup *group = new QGraphicsItemGroup; group->setSelected(true); @@ -3767,7 +3766,7 @@ void tst_QGraphicsItem::handlesChildEvents() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(20); // Pull out the items, closest item first @@ -3891,7 +3890,7 @@ void tst_QGraphicsItem::handlesChildEvents2() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); QMouseEvent event(QEvent::MouseButtonPress, view.mapFromScene(5, 5), @@ -3980,7 +3979,7 @@ void tst_QGraphicsItem::filtersChildEvents() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(20); QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress); @@ -4051,7 +4050,7 @@ void tst_QGraphicsItem::filtersChildEvents2() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); QMouseEvent event(QEvent::MouseButtonPress, view.mapFromScene(5, 5), @@ -4099,7 +4098,7 @@ void tst_QGraphicsItem::ensureVisible() QGraphicsView view(&scene); view.setFixedSize(300, 300); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); for (int i = 0; i < 25; ++i) { view.scale(qreal(1.06), qreal(1.06)); @@ -5014,7 +5013,7 @@ void tst_QGraphicsItem::sceneEventFilter() QGraphicsTextItem *ti3 = anotherScene->addText("This is a test #3"); gv.setScene(anotherScene); gv.show(); - QTest::qWaitForWindowShown(&gv); + QVERIFY(QTest::qWaitForWindowExposed(&gv)); QTest::qWait(25); ti->installSceneEventFilter(ti2); ti3->installSceneEventFilter(ti); @@ -5072,7 +5071,7 @@ void tst_QGraphicsItem::paint() view.showFullScreen(); else view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); #ifdef Q_OS_WIN32 //we try to switch the desktop: if it fails, we skip the test @@ -5088,7 +5087,7 @@ void tst_QGraphicsItem::paint() QGraphicsScene scene2; QGraphicsView view2(&scene2); view2.show(); - QTest::qWaitForWindowShown(&view2); + QVERIFY(QTest::qWaitForWindowExposed(&view2)); QTest::qWait(25); PaintTester tester2; @@ -6094,7 +6093,7 @@ void tst_QGraphicsItem::untransformable() view.setBackgroundBrush(QBrush(Qt::black, Qt::DiagCrossPattern)); #endif - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); for (int i = 0; i < 10; ++i) { QPoint center = view.viewport()->rect().center(); @@ -6157,7 +6156,7 @@ void tst_QGraphicsItem::contextMenuEventPropagation() view.setAlignment(Qt::AlignLeft | Qt::AlignTop); view.show(); view.resize(200, 200); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(20); QContextMenuEvent event(QContextMenuEvent::Mouse, QPoint(10, 10), @@ -6259,7 +6258,7 @@ void tst_QGraphicsItem::task141694_textItemEnsureVisible() QGraphicsView view(&scene); view.setFixedSize(200, 200); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.ensureVisible(-1000, -1000, 5, 5); int hscroll = view.horizontalScrollBar()->value(); @@ -6433,7 +6432,7 @@ void tst_QGraphicsItem::ensureUpdateOnTextItem() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(25); TextItem *text1 = new TextItem(QLatin1String("123")); scene.addItem(text1); @@ -6860,7 +6859,7 @@ void tst_QGraphicsItem::itemStacksBehindParent() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_VERIFY(!paintedItems.isEmpty()); QTest::qWait(100); paintedItems.clear(); @@ -6958,7 +6957,7 @@ void tst_QGraphicsItem::nestedClipping() QGraphicsView view(&scene); view.setOptimizationFlag(QGraphicsView::IndirectPainting); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(25); QList<QGraphicsItem *> expected; @@ -7173,7 +7172,7 @@ void tst_QGraphicsItem::cacheMode() view.resize(150, 150); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); // Increase the probability of window activation // not causing another repaint of test items. @@ -7367,7 +7366,7 @@ void tst_QGraphicsItem::cacheMode2() view.resize(150, 150); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); // Increase the probability of window activation // not causing another repaint of test items. @@ -7444,7 +7443,7 @@ void tst_QGraphicsItem::updateCachedItemAfterMove() scene.addItem(tester); QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(12); QTRY_VERIFY(tester->repaints > 0); @@ -7870,7 +7869,7 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption() topLevel.setWindowFlags(Qt::X11BypassWindowManagerHint); rect->startTrack = false; topLevel.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&topLevel)); QTest::qWait(60); rect->startTrack = true; rect->update(10, 10, 10, 10); @@ -9059,8 +9058,9 @@ void tst_QGraphicsItem::ensureDirtySceneTransform() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); //We move the parent parent->move(); @@ -9349,8 +9349,9 @@ void tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view); + QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); QTRY_COMPARE(tester->repaints, 1); @@ -10427,7 +10428,7 @@ void tst_QGraphicsItem::textItem_shortcuts() item->setFlag(QGraphicsItem::ItemIsFocusable); item->setTextInteractionFlags(Qt::TextEditorInteraction); w.show(); - QTest::qWaitForWindowShown(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); item->setFocus(); QTRY_VERIFY(item->hasFocus()); @@ -10589,7 +10590,7 @@ void tst_QGraphicsItem::focusHandling() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::setActiveWindow(&view); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); @@ -10674,7 +10675,7 @@ void tst_QGraphicsItem::touchEventPropagation() QGraphicsView view(&scene); view.setSceneRect(touchEventReceiver->boundingRect()); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(touchEventReceiver->touchBeginEventCount, 0); @@ -10710,7 +10711,7 @@ void tst_QGraphicsItem::deviceCoordinateCache_simpleRotations() MyGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_VERIFY(view.repaints > 0); QGraphicsItemCache *itemCache = QGraphicsItemPrivate::get(item)->extraItemCache(); @@ -10790,7 +10791,7 @@ void tst_QGraphicsItem::QTBUG_5418_textItemSetDefaultColor() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); scene.addItem(i); QApplication::processEvents(); QTRY_VERIFY(i->painted); @@ -11126,8 +11127,8 @@ void tst_QGraphicsItem::itemDiesDuringDraggingOperation() scene.addItem(item); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); QGraphicsSceneDragDropEvent dragEnter(QEvent::GraphicsSceneDragEnter); dragEnter.setScenePos(item->boundingRect().center()); QApplication::sendEvent(&scene, &dragEnter); @@ -11153,8 +11154,8 @@ void tst_QGraphicsItem::QTBUG_12112_focusItem() view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); QVERIFY(item1->focusItem()); QVERIFY(!item2->focusItem()); @@ -11238,7 +11239,7 @@ void tst_QGraphicsItem::QTBUG_16374_crashInDestructor() scene.addItem(&win); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); } void tst_QGraphicsItem::QTBUG_20699_focusScopeCrash() @@ -11258,7 +11259,7 @@ void tst_QGraphicsItem::QTBUG_20699_focusScopeCrash() fi->setFocus(); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); fi->setParentItem(fi2); fi->setFocus(); diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index fdf4eada4d..e244d9fdbb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -147,7 +147,7 @@ void tst_QGraphicsLayout::compressLayoutRequest() scene.addItem(tw); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QGraphicsLinearLayout *lout = new QGraphicsLinearLayout(tw); for (int i = 0; i < 4; ++i) { QGraphicsWidget *gw = new QGraphicsWidget(tw); diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 35b67d4451..06d768eaf3 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -339,7 +339,7 @@ void tst_QGraphicsLinearLayout::alignment() widget->resize(newSize); view.show(); widget->show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); int x = 0; @@ -669,7 +669,7 @@ void tst_QGraphicsLinearLayout::invalidate() view.show(); widget->show(); //QTest::qWait(1000); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); qApp->processEvents(); layout.layoutRequest = 0; @@ -1158,7 +1158,7 @@ void tst_QGraphicsLinearLayout::testStretch() //view->setSceneRect(-50, -50, 800, 800); //view->show(); - //QTest::qWaitForWindowShown(view); + //QVERIFY(QTest::qWaitForWindowExposed(view)); //QTest::qWait(5000); QCOMPARE(form->geometry().size(), QSizeF(600,600)); QCOMPARE(w1->geometry(), QRectF(0, 0, 100, 100)); diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 53c8be4a61..74cd45ca65 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1088,8 +1088,8 @@ void tst_QGraphicsProxyWidget::keyPressEvent() view.show(); view.viewport()->setFocus(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!! @@ -1129,8 +1129,8 @@ void tst_QGraphicsProxyWidget::keyReleaseEvent() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; @@ -1173,8 +1173,8 @@ void tst_QGraphicsProxyWidget::mouseDoubleClickEvent() view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget*)&view); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!! @@ -1217,7 +1217,7 @@ void tst_QGraphicsProxyWidget::mousePressReleaseEvent() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget; proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!! @@ -1279,8 +1279,8 @@ void tst_QGraphicsProxyWidget::paintEvent() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_VERIFY(view.isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(view.isActiveWindow()); SubQGraphicsProxyWidget proxy; @@ -1289,7 +1289,7 @@ void tst_QGraphicsProxyWidget::paintEvent() //this bug prevents the widget from being updated w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); QApplication::processEvents(); QTest::qWait(30); proxy.setWidget(w); @@ -1691,7 +1691,7 @@ void tst_QGraphicsProxyWidget::tabFocus_simpleWidget() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); + QVERIFY(QTest::qWaitForWindowActive(&window)); leftDial->setFocus(); QApplication::processEvents(); @@ -1775,7 +1775,7 @@ void tst_QGraphicsProxyWidget::tabFocus_simpleTwoWidgets() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); + QVERIFY(QTest::qWaitForWindowActive(&window)); leftDial->setFocus(); QApplication::processEvents(); @@ -1908,7 +1908,7 @@ void tst_QGraphicsProxyWidget::tabFocus_complexWidget() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); + QVERIFY(QTest::qWaitForWindowActive(&window)); leftDial->setFocus(); QApplication::processEvents(); @@ -2219,8 +2219,8 @@ void tst_QGraphicsProxyWidget::setFocus_simpleWidget() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); - QTRY_COMPARE(QApplication::activeWindow(), &window); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QApplication::processEvents(); @@ -2291,8 +2291,8 @@ void tst_QGraphicsProxyWidget::setFocus_simpleTwoWidgets() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); - QTRY_COMPARE(QApplication::activeWindow(), &window); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QApplication::processEvents(); @@ -2370,8 +2370,8 @@ void tst_QGraphicsProxyWidget::setFocus_complexTwoWidgets() window.show(); QApplication::setActiveWindow(&window); window.activateWindow(); - QTest::qWaitForWindowShown(&window); - QTRY_COMPARE(QApplication::activeWindow(), &window); + QVERIFY(QTest::qWaitForWindowActive(&window)); + QCOMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QApplication::processEvents(); @@ -2461,7 +2461,7 @@ void tst_QGraphicsProxyWidget::popup_basic() QCOMPARE(box->pos(), QPoint()); QCOMPARE(proxy->pos(), QPointF()); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(125); QApplication::processEvents(); @@ -2556,9 +2556,8 @@ void tst_QGraphicsProxyWidget::changingCursor_basic() proxy->show(); scene.addItem(proxy); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QApplication::processEvents(); - QTRY_VERIFY(view.isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(view.isActiveWindow()); // in QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center()))); @@ -2967,7 +2966,7 @@ void tst_QGraphicsProxyWidget::dontCrashWhenDie() { MainWidget *w = new MainWidget(); w->show(); - QTest::qWaitForWindowShown(w); + QVERIFY(QTest::qWaitForWindowExposed(w)); QTest::qWait(100); QTest::mouseMove(w->view->viewport(), w->view->mapFromScene(w->widget->mapToScene(w->widget->boundingRect().center()))); delete w->item; @@ -3120,7 +3119,7 @@ void tst_QGraphicsProxyWidget::actionsContextMenu() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); view.setFocus(); QTRY_VERIFY(view.hasFocus()); @@ -3627,8 +3626,8 @@ void tst_QGraphicsProxyWidget::QTBUG_6986_sendMouseEventToAlienWidget() view.resize(600, 600); QApplication::setActiveWindow(&view); view.show(); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), &view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), &view); QCursor::setPos(view.mapToGlobal(view.mapFromScene(scene.topButton->boundingRect().center()))); QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(scene.topButton->scenePos())); QTRY_COMPARE(scene.hoverButton->hoverLeaveReceived, true); diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 7299e2ad8b..e188805d6a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -3138,8 +3138,8 @@ void tst_QGraphicsScene::tabFocus_sceneWithFocusableItems() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWaitForWindowShown(&widget); - QTRY_VERIFY(view->hasFocus()); + QVERIFY(QTest::qWaitForWindowActive(&widget)); + QVERIFY(view->hasFocus()); QTRY_VERIFY(scene.isActive()); QVERIFY(view->viewport()->hasFocus()); QVERIFY(scene.hasFocus()); @@ -3219,8 +3219,7 @@ void tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWaitForWindowShown(&widget); - QApplication::processEvents(); + QVERIFY(QTest::qWaitForWindowActive(&widget)); dial1->setFocus(); QTRY_VERIFY(dial1->hasFocus()); @@ -3259,7 +3258,7 @@ void tst_QGraphicsScene::tabFocus_sceneWithFocusWidgets() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWaitForWindowShown(&widget); + QVERIFY(QTest::qWaitForWindowActive(&widget)); QTRY_VERIFY(widget1->hasFocus()); } @@ -3303,7 +3302,7 @@ void tst_QGraphicsScene::tabFocus_sceneWithNestedFocusWidgets() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWaitForWindowShown(&widget); + QVERIFY(QTest::qWaitForWindowActive(&widget)); dial1->setFocus(); QTRY_VERIFY(dial1->hasFocus()); @@ -3388,8 +3387,7 @@ void tst_QGraphicsScene::tabFocus_sceneWithNestedFocusWidgets() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWaitForWindowShown(&widget); - QApplication::processEvents(); + QVERIFY(QTest::qWaitForWindowActive(&widget)); QTRY_VERIFY(widget1->hasFocus()); } @@ -4181,8 +4179,8 @@ void tst_QGraphicsScene::isActive() toplevel3.show(); QApplication::setActiveWindow(&toplevel3); - QTest::qWaitForWindowShown(&toplevel3); - QTRY_COMPARE(QApplication::activeWindow(), &toplevel3); + QVERIFY(QTest::qWaitForWindowActive(&toplevel3)); + QCOMPARE(QApplication::activeWindow(), &toplevel3); QVERIFY(scene1.isActive()); QVERIFY(!scene2.isActive()); @@ -4350,7 +4348,7 @@ void tst_QGraphicsScene::taskQT657_paintIntoCacheWithTransparentParts() proxy->rotate(15); view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); view->repaints = 0; proxy->update(10, 10, 10, 10); QTest::qWait(50); @@ -4396,7 +4394,7 @@ void tst_QGraphicsScene::taskQTBUG_7863_paintIntoCacheWithTransparentParts() backItem->rotate(15); view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); view->repaints = 0; rectItem->update(10, 10, 10, 10); QTest::qWait(50); @@ -4438,7 +4436,7 @@ void tst_QGraphicsScene::taskQTBUG_7863_paintIntoCacheWithTransparentParts() rectItem->rotate(15); view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); view->repaints = 0; rectItem->update(10, 10, 10, 10); QTest::qWait(50); @@ -4479,7 +4477,7 @@ void tst_QGraphicsScene::taskQTBUG_7863_paintIntoCacheWithTransparentParts() rectItem->rotate(15); view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); view->repaints = 0; rectItem->update(10, 10, 10, 10); QTest::qWait(50); @@ -4581,8 +4579,8 @@ void tst_QGraphicsScene::taskQTBUG_16401_focusItem() rect->setFlag(QGraphicsItem::ItemIsFocusable); view.show(); - QTest::qWaitForWindowShown(&view); QApplication::setActiveWindow(&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); QVERIFY(!scene.focusItem()); diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 450b970958..b7c99d559a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -276,9 +276,7 @@ void tst_QGraphicsSceneIndex::removeItems() view.resize(600, 600); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - - QApplication::processEvents(); + QVERIFY(QTest::qWaitForWindowActive(&view)); scene.removeItem(widgetChild1); diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index df15090150..a27e14bcef 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -309,7 +309,7 @@ void tst_QGraphicsView::construction() QCOMPARE(view.transformationAnchor(), QGraphicsView::AnchorViewCenter); QCOMPARE(view.resizeAnchor(), QGraphicsView::NoAnchor); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); } class TestItem : public QGraphicsItem @@ -357,7 +357,7 @@ void tst_QGraphicsView::renderHints() QCOMPARE(item->hints, 0); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.repaint(); QTRY_COMPARE(item->hints, view.renderHints()); @@ -375,7 +375,7 @@ void tst_QGraphicsView::alignment() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { @@ -492,7 +492,7 @@ void tst_QGraphicsView::setScene() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(view.sceneRect(), scene.sceneRect()); @@ -664,7 +664,7 @@ void tst_QGraphicsView::dragMode_scrollHand() view.setFixedSize(100, 100); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); view.setInteractive(j ? false : true); @@ -800,7 +800,7 @@ void tst_QGraphicsView::dragMode_rubberBand() view.setDragMode(QGraphicsView::RubberBandDrag); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); for (int i = 0; i < 2; ++i) { @@ -1157,7 +1157,7 @@ void tst_QGraphicsView::centerOnItem() QGraphicsView view(&scene); view.setSceneRect(-1000, -1000, 2000, 2000); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); int tolerance = 7; for (int x = 0; x < 3; ++x) { @@ -1209,7 +1209,7 @@ void tst_QGraphicsView::ensureVisibleRect() view.setSceneRect(-500, -500, 1000, 1000); view.setFixedSize(250, 250); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); for (int y = -100; y < 100; y += 25) { for (int x = -100; x < 100; x += 13) { @@ -1404,7 +1404,7 @@ void tst_QGraphicsView::itemsAtPosition() view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QPoint screenPos = view.viewport()->mapToGlobal(viewPos); QPointF scenePos = view.mapToScene(viewPos); @@ -1659,7 +1659,7 @@ void tst_QGraphicsView::itemAt2() view.setTransformationAnchor(QGraphicsView::NoAnchor); view.setRenderHint(QPainter::Antialiasing); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); QPoint itemViewPoint = view.mapFromScene(item->scenePos()); @@ -2018,10 +2018,9 @@ void tst_QGraphicsView::sendEvent() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); QApplication::setActiveWindow(&view); - QTest::qWait(20); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); item->setFocus(); @@ -2086,10 +2085,9 @@ void tst_QGraphicsView::wheelEvent() // Assign a view. QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); QApplication::setActiveWindow(&view); - QTest::qWait(20); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); // Send a wheel event with horizontal orientation. @@ -2130,7 +2128,7 @@ void tst_QGraphicsView::cursor() QGraphicsView view(&scene); view.setFixedSize(400, 400); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(view.viewport()->cursor().shape(), QCursor().shape()); view.viewport()->setCursor(Qt::PointingHandCursor); @@ -2167,7 +2165,7 @@ void tst_QGraphicsView::cursor2() view.viewport()->setCursor(Qt::PointingHandCursor); view.setFixedSize(400, 400); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); sendMouseMove(view.viewport(), view.mapFromScene(-30, -30)); QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor); @@ -2268,7 +2266,7 @@ void tst_QGraphicsView::resizeAnchor() for (int i = 0; i < 2; ++i) { view.resize(100, 100); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); if (i == 0) { @@ -2420,8 +2418,8 @@ void tst_QGraphicsView::viewportUpdateMode2() view.getContentsMargins(&left, &top, &right, &bottom); view.resize(200 + left + right, 200 + top + bottom); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); - QTest::qWait(50); + qApp->setActiveWindow(&toplevel); + QVERIFY(QTest::qWaitForWindowActive(&toplevel)); QTRY_VERIFY(view.painted); const QRect viewportRect = view.viewport()->rect(); QCOMPARE(viewportRect, QRect(0, 0, 200, 200)); @@ -2568,7 +2566,7 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.viewport()->repaint(); QVERIFY(!parent->dirtyPainter); @@ -2586,12 +2584,12 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState() MyGraphicsView painter(&scene); painter.show(); - QTest::qWaitForWindowShown(&painter); + QVERIFY(QTest::qWaitForWindowExposed(&painter)); MyGraphicsView painter2(&scene); painter2.setOptimizationFlag(QGraphicsView::DontSavePainterState,true); painter2.show(); - QTest::qWaitForWindowShown(&painter2); + QVERIFY(QTest::qWaitForWindowExposed(&painter2)); } void tst_QGraphicsView::optimizationFlags_dontSavePainterState2_data() @@ -2730,7 +2728,7 @@ void tst_QGraphicsView::levelOfDetail() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_COMPARE(item->lastLod, qreal(1)); @@ -2823,7 +2821,7 @@ void tst_QGraphicsView::acceptMousePressEvent() TestView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QMouseEvent event(QEvent::MouseButtonPress, view.viewport()->rect().center(), @@ -2898,7 +2896,7 @@ void tst_QGraphicsView::itemsUnderMouse() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(view.items(view.mapFromScene(w3.boundingRect().center())).first(), static_cast<QGraphicsItem *>(&w3)); @@ -2935,9 +2933,9 @@ void tst_QGraphicsView::task172231_untransformableItems() view.scale(2, 1); view.show(); - QTest::qWaitForWindowShown(&view); QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); QRectF origExposedRect = text->exposedRect; @@ -3042,7 +3040,7 @@ void tst_QGraphicsView::task186827_deleteReplayedItem() MouseMoveCounter view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.viewport()->setMouseTracking(true); QCOMPARE(view.mouseMoves, 0); @@ -3076,10 +3074,10 @@ void tst_QGraphicsView::task207546_focusCrash() widget.layout()->addWidget(gr1); widget.layout()->addWidget(gr2); widget.show(); - QTest::qWaitForWindowShown(&widget); widget.activateWindow(); QApplication::setActiveWindow(&widget); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&widget)); + QVERIFY(QTest::qWaitForWindowActive(&widget)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&widget)); widget.focusNextPrevChild(true); QCOMPARE(static_cast<QWidget *>(gr2), widget.focusWidget()); } @@ -3219,7 +3217,7 @@ void tst_QGraphicsView::task245469_itemsAtPointWithClip() view.resize(150,150); view.rotate(90); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QList<QGraphicsItem *> itemsAtCenter = view.items(view.viewport()->rect().center()); QCOMPARE(itemsAtCenter, (QList<QGraphicsItem *>() << child << parent)); @@ -3338,7 +3336,7 @@ void tst_QGraphicsView::scrollAfterResize() view.setSceneRect(-1000, -1000, 2000, 2000); view.resize(300, 300); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); view.horizontalScrollBar()->setValue(0); view.verticalScrollBar()->setValue(0); QCOMPARE(view.viewportTransform(), x1); @@ -3408,7 +3406,7 @@ void tst_QGraphicsView::moveItemWhileScrolling() view.show(); if (changedConnected) QObject::connect(view.scene(), SIGNAL(changed(QList<QRectF>)), this, SLOT(dummySlot())); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); QTRY_VERIFY(view.painted); view.painted = false; @@ -3445,7 +3443,7 @@ void tst_QGraphicsView::centerOnDirtyItem() view.centerOn(item); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); QTest::qWait(50); QImage before(view.viewport()->size(), QImage::Format_ARGB32); @@ -3575,7 +3573,7 @@ void tst_QGraphicsView::mouseTracking2() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(!view.viewport()->hasMouseTracking()); view.viewport()->setMouseTracking(true); // Explicitly enable mouse tracking. @@ -3711,7 +3709,7 @@ void tst_QGraphicsView::render() view.resize(200, 200); view.painted = false; view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QApplication::processEvents(); QTRY_VERIFY(view.painted); @@ -3824,7 +3822,7 @@ void tst_QGraphicsView::update() view.getContentsMargins(&left, &top, &right, &bottom); view.resize(200 + left + right, 200 + top + bottom); toplevel.show(); - QTest::qWaitForWindowShown(&toplevel); + QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); QApplication::setActiveWindow(&toplevel); @@ -4091,9 +4089,9 @@ void tst_QGraphicsView::inputMethodSensitivity() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); FocusItem *item = new FocusItem; @@ -4247,7 +4245,7 @@ void tst_QGraphicsView::indirectPainting() QGraphicsView view(&scene); view.setOptimizationFlag(QGraphicsView::IndirectPainting); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTest::qWait(100); scene.drawCount = 0; @@ -4274,7 +4272,7 @@ void tst_QGraphicsView::compositionModeInDrawBackground() QGraphicsScene dummy; MyView view(&dummy); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Make sure the painter's composition mode is SourceOver in drawBackground. QTRY_VERIFY(view.painted); @@ -4399,7 +4397,7 @@ void tst_QGraphicsView::task259503_scrollingArtifacts() SAGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); int hsbValue = view.horizontalScrollBar()->value(); view.horizontalScrollBar()->setValue(hsbValue / 2); @@ -4456,10 +4454,9 @@ void tst_QGraphicsView::QTBUG_4151_clipAndIgnore() view.setFrameStyle(0); view.resize(75, 75); view.show(); - QTest::qWaitForWindowShown(&view); view.activateWindow(); - - QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget *)&view); QCOMPARE(view.items(view.rect()).size(), numItems); } @@ -4518,7 +4515,7 @@ void tst_QGraphicsView::QTBUG_7438_cursor() QGraphicsView view(&scene); view.setFixedSize(400, 400); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(view.viewport()->cursor().shape(), QCursor().shape()); view.viewport()->setCursor(Qt::PointingHandCursor); diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 66d228a271..7a8e6f1522 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -680,7 +680,7 @@ void tst_QGraphicsWidget::fontPropagatesResolveToChildren() QGraphicsView view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); @@ -715,7 +715,7 @@ void tst_QGraphicsWidget::fontPropagatesResolveToGrandChildren() QGraphicsView view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); @@ -751,7 +751,7 @@ void tst_QGraphicsWidget::fontPropagatesResolveViaNonWidget() QGraphicsView view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(grandChild1->font().resolve(), uint(QFont::StyleResolved)); @@ -787,7 +787,7 @@ void tst_QGraphicsWidget::fontPropagatesResolveFromScene() QGraphicsView view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QCOMPARE(font.resolve(), uint(QFont::StyleResolved)); QCOMPARE(root->font().resolve(), uint(QFont::StyleResolved)); @@ -835,7 +835,7 @@ void tst_QGraphicsWidget::fontPropagatesResolveInParentChange() QGraphicsView view; view.setScene(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(grandChild1->font().italic()); QVERIFY(!grandChild1->font().bold()); @@ -1228,7 +1228,7 @@ void tst_QGraphicsWidget::layoutDirection() widget.setLayoutDirection(layoutDirection); QCOMPARE(widget.testAttribute(Qt::WA_SetLayoutDirection), true); view->show(); - QTest::qWaitForWindowShown(view); + QVERIFY(QTest::qWaitForWindowExposed(view)); for (int i = 0; i < children.count(); ++i) { QTRY_COMPARE(children[i]->layoutDirection(), layoutDirection); QTRY_COMPARE(children[i]->testAttribute(Qt::WA_SetLayoutDirection), false); @@ -1501,8 +1501,8 @@ void tst_QGraphicsWidget::setTabOrderAndReparent() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), (QWidget*)&view); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), (QWidget*)&view); int i; QGraphicsWidget *w1, *w2, *w3, *w4; @@ -2623,7 +2623,7 @@ void tst_QGraphicsWidget::painterStateProtectionOnWindowFrame() QGraphicsView view(&scene); scene.addItem(widget); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); } class ProxyStyle : public QCommonStyle @@ -2827,7 +2827,7 @@ void tst_QGraphicsWidget::ensureClipping() QGraphicsView view(&scene); view.setOptimizationFlag(QGraphicsView::IndirectPainting); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QList<QGraphicsItem *> expected; expected << clipWidget << childWidget << childitem; @@ -3033,7 +3033,7 @@ void tst_QGraphicsWidget::addChildInpolishEvent() QGraphicsView view(&scene); view.resize(200, 200); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_COMPARE(PolishWidget::numberOfPolish, 2); } @@ -3055,7 +3055,7 @@ void tst_QGraphicsWidget::polishEvent() QGraphicsView view(&scene); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); // Make sure the item is painted. QTRY_VERIFY(widget->events.contains(QEvent::Paint)); @@ -3233,7 +3233,7 @@ void tst_QGraphicsWidget::itemChangeEvents() QGraphicsWidget *parent = new QGraphicsWidget; scene.addItem(parent); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); TestGraphicsWidget *item = new TestGraphicsWidget; item->setParentItem(parent); @@ -3275,7 +3275,7 @@ void tst_QGraphicsWidget::itemSendGeometryPosChangesDeactivated() QGraphicsWidget *item = new QGraphicsWidget; scene.addItem(item); view.show(); - QTest::qWaitForWindowShown(&view); + QVERIFY(QTest::qWaitForWindowExposed(&view)); item->setGeometry(QRectF(0, 0, 50, 50)); QTRY_COMPARE(item->geometry(), QRectF(0, 0, 50, 50)); |