Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

3 files changed, 16 insertions, 34 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 98c3866dd2..639a1f61a9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -11116,20 +11116,23 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene()
         view.showFullScreen();
     else
         view.show();
-    QTest::qWaitForWindowShown(&view);
-    QEXPECT_FAIL("", "QTBUG-22434", Abort);
-    QTRY_COMPARE(view.repaints, 1);
-    QTRY_COMPARE(item->painted, 1);
+    QTest::qWaitForWindowShown(view.windowHandle());
+    view.activateWindow();
+    QTRY_VERIFY(view.isActiveWindow());
+    QTRY_VERIFY(view.repaints >= 1);
+    int count = view.repaints;
+    QTRY_COMPARE(item->painted, count);
+    // cached as graphics effects, not painted multiple times
     QTRY_COMPARE(item2->painted, 1);
     QTRY_COMPARE(item3->painted, 1);
     item2->update();
     QApplication::processEvents();
-    QTRY_COMPARE(item->painted, 2);
+    QTRY_COMPARE(item->painted, count + 1);
     QTRY_COMPARE(item2->painted, 2);
     QTRY_COMPARE(item3->painted, 2);
     item2->update();
     QApplication::processEvents();
-    QTRY_COMPARE(item->painted, 3);
+    QTRY_COMPARE(item->painted, count + 2);
     QTRY_COMPARE(item2->painted, 3);
     QTRY_COMPARE(item3->painted, 3);
 }
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 8772fb1e7e..df529c6095 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1078,19 +1078,14 @@ void tst_QGraphicsScene::addItem()
         CustomView view;
         view.setScene(&scene);
         view.show();
-#ifdef Q_WS_X11
-        qt_x11_wait_for_window_manager(&view);
-#endif
+        QTest::qWaitForWindowShown(view.windowHandle());
         qApp->processEvents();
         view.repaints = 0;
 
         scene.addItem(path);
 
         // Adding an item should always issue a repaint.
-        qApp->processEvents(); // <- delayed update is called
-        qApp->processEvents(); // <- scene schedules pending update
-        qApp->processEvents(); // <- pending update is sent to view
-        QVERIFY(view.repaints > 0);
+        QTRY_VERIFY(view.repaints > 0);
         view.repaints = 0;
 
         QCOMPARE(scene.itemAt(0, 0), path);
@@ -1103,10 +1098,7 @@ void tst_QGraphicsScene::addItem()
         scene.addItem(path2);
 
         // Adding an item should always issue a repaint.
-        qApp->processEvents(); // <- delayed update is called
-        qApp->processEvents(); // <- scene schedules pending update
-        qApp->processEvents(); // <- pending update is sent to view
-        QVERIFY(view.repaints > 0);
+        QTRY_VERIFY(view.repaints > 0);
 
         QCOMPARE(scene.itemAt(100, 100), path2);
     }
@@ -1285,9 +1277,7 @@ void tst_QGraphicsScene::removeItem()
     QGraphicsView view(&scene);
     view.setFixedSize(150, 150);
     view.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&view);
-#endif
+    QTest::qWaitForWindowShown(view.windowHandle());
     QTest::mouseMove(view.viewport(), QPoint(-1, -1));
     {
         QMouseEvent moveEvent(QEvent::MouseMove, view.mapFromScene(hoverItem->scenePos() + QPointF(20, 20)), Qt::NoButton, 0, 0);
@@ -1615,9 +1605,7 @@ void tst_QGraphicsScene::hoverEvents_siblings()
     view.rotate(10);
     view.scale(1.7, 1.7);
     view.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&view);
-#endif
+    QTest::qWaitForWindowShown(view.windowHandle());
     qApp->setActiveWindow(&view);
     view.activateWindow();
     QTest::qWait(70);
@@ -2748,11 +2736,8 @@ void tst_QGraphicsScene::contextMenuEvent()
 
     QGraphicsView view(&scene);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QTest::qWaitForWindowShown(view.windowHandle());
     view.activateWindow();
-#ifdef Q_WS_X11
-        qt_x11_wait_for_window_manager(&view);
-#endif
     view.centerOn(item);
 
     {
@@ -2785,10 +2770,7 @@ void tst_QGraphicsScene::contextMenuEvent_ItemIgnoresTransformations()
     QGraphicsView view(&scene, &topLevel);
     view.resize(200, 200);
     topLevel.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&view);
-#endif
-    QTest::qWaitForWindowShown(&topLevel);
+    QTest::qWaitForWindowShown(topLevel.windowHandle());
 
     {
         QPoint pos(50, 50);
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index c6b2b49d98..3c98f8936c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -1384,7 +1384,6 @@ void tst_QGraphicsWidget::setAttribute_data()
     QTest::newRow("WA_RightToLeft") << Qt::WA_RightToLeft << true;
     QTest::newRow("WA_SetStyle") << Qt::WA_SetStyle << true;
     QTest::newRow("WA_Resized") << Qt::WA_Resized << true;
-    QTest::newRow("unsupported") << Qt::WA_PaintOutsidePaintEvent << false;
 }
 
 // void setAttribute(Qt::WidgetAttribute attribute, bool on = true) public
@@ -1393,8 +1392,6 @@ void tst_QGraphicsWidget::setAttribute()
     QFETCH(Qt::WidgetAttribute, attribute);
     QFETCH(bool, supported);
     SubQGraphicsWidget widget;
-    if (attribute == Qt::WA_PaintOutsidePaintEvent)
-        QTest::ignoreMessage(QtWarningMsg, "QGraphicsWidget::setAttribute: unsupported attribute 13");
     widget.setAttribute(attribute);
     QCOMPARE(widget.testAttribute(attribute), supported);
 }