diff options
Diffstat (limited to 'Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp')
-rw-r--r-- | Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp b/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp index 992eb904b..9ae960b9c 100644 --- a/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp +++ b/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp @@ -184,7 +184,7 @@ void tst_QGraphicsWebView::widgetsRenderingThroughCache() scene->addItem(webView); view.setGeometry(QRect(0, 0, 500, 500)); QWidget *const widget = &view; - QTest::qWaitForWindowShown(widget); + QTest::qWaitForWindowExposed(widget); // 1. Reference without tiling. webView->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, false); @@ -409,11 +409,11 @@ void tst_QGraphicsWebView::setPalette() QVERIFY(webView1.palette() == palette1); QVERIFY(webView1.page()->palette() == palette1); - QTest::qWaitForWindowShown(&view1); + QTest::qWaitForWindowExposed(&view1); if (!active) { controlView.show(); - QTest::qWaitForWindowShown(&controlView); + QTest::qWaitForWindowExposed(&controlView); QApplication::setActiveWindow(&controlView); activeView = &controlView; controlView.activateWindow(); @@ -464,11 +464,11 @@ void tst_QGraphicsWebView::setPalette() webView2.setPalette(palette2); view2.show(); - QTest::qWaitForWindowShown(&view2); + QTest::qWaitForWindowExposed(&view2); if (!active) { controlView.show(); - QTest::qWaitForWindowShown(&controlView); + QTest::qWaitForWindowExposed(&controlView); QApplication::setActiveWindow(&controlView); activeView = &controlView; controlView.activateWindow(); @@ -610,7 +610,7 @@ void tst_QGraphicsWebView::compareCanvasToImage(const QUrl& url, const QImage& r { GraphicsView view; view.show(); - QTest::qWaitForWindowShown(&view); + QTest::qWaitForWindowExposed(&view); QGraphicsWebView* const graphicsWebView = view.m_webView; graphicsWebView->load(url); @@ -620,7 +620,6 @@ void tst_QGraphicsWebView::compareCanvasToImage(const QUrl& url, const QImage& r QPainter painter(&pixmap); view.render(&painter); } - QApplication::syncX(); const QSize imageSize = reference.size(); |