Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

6 files changed, 70 insertions, 84 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index ad17c2a557..4d5857c3c8 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -159,12 +159,7 @@ public:
 struct ItemDesc
 {
     ItemDesc(int row, int col)
-    : m_pos(qMakePair(row, col)),
-      m_rowSpan(1),
-      m_colSpan(1),
-      m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)),
-      m_align(0),
-      m_fnConstraint(0)
+    : m_pos(qMakePair(row, col))
     {
     }
 
@@ -278,17 +273,17 @@ struct ItemDesc
 
 //private:
     QPair<int,int> m_pos; // row,col
-    int m_rowSpan;
-    int m_colSpan;
-    QSizePolicy m_sizePolicy;
+    int m_rowSpan = 1;
+    int m_colSpan = 1;
+    QSizePolicy m_sizePolicy{QSizePolicy::Preferred, QSizePolicy::Preferred};
 
     // Initializer {} is a workaround for gcc bug 68949
     QSizeF m_sizeHints[Qt::NSizeHints] {};
     QSizeF m_sizes[Qt::NSizeHints] {};
     Qt::Alignment m_align;
 
-    Qt::Orientation m_constraintOrientation;
-    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &);
+    Qt::Orientation m_constraintOrientation = Qt::Horizontal;
+    QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &) = nullptr;
 };
 
 typedef QList<ItemDesc> ItemList;
@@ -340,7 +335,7 @@ void tst_QGraphicsGridLayout::qgraphicsgridlayout()
     layout.setColumnStretchFactor(0, 0);
     layout.setGeometry(QRectF());
     layout.setHorizontalSpacing(0);
-    layout.setRowAlignment(0, 0);
+    layout.setRowAlignment(0, { });
     layout.setRowFixedHeight(0, 0);
     layout.setRowMaximumHeight(0, 0);
     layout.setRowMinimumHeight(0, 0);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 0fb95b9f34..0010718d3e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -1914,7 +1914,7 @@ void tst_QGraphicsItem::acceptedMouseButtons()
     event.setScenePos(QPointF(0, 0));
     QCoreApplication::sendEvent(&scene, &event);
     QCOMPARE(scene.mouseGrabberItem(), item2);
-    item2->setAcceptedMouseButtons(nullptr);
+    item2->setAcceptedMouseButtons({ });
     QCOMPARE(scene.mouseGrabberItem(), nullptr);
     QCoreApplication::sendEvent(&scene, &event);
     QCOMPARE(scene.mouseGrabberItem(), item1);
@@ -8071,7 +8071,7 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption()
 void tst_QGraphicsItem::itemSendsGeometryChanges()
 {
     ItemChangeTester item;
-    item.setFlags(nullptr);
+    item.setFlags({ });
     item.clear();
 
     QTransform x = QTransform().rotate(45);
@@ -8299,20 +8299,14 @@ void tst_QGraphicsItem::sorting()
 
     _paintedItems.clear();
 
-    view.viewport()->repaint();
-#if defined(Q_OS_MAC)
-    // There's no difference between repaint and update on the Mac,
-    // so we have to process events here to make sure we get the event.
-    QTest::qWait(100);
-#endif
-
+    view.viewport()->update();
     const GraphicsItems expected{grid[0][0], grid[0][1], grid[0][2], grid[0][3],
                                  grid[1][0], grid[1][1], grid[1][2], grid[1][3],
                                  grid[2][0], grid[2][1], grid[2][2], grid[2][3],
                                  grid[3][0], grid[3][1], grid[3][2], grid[3][3],
                                  grid[4][0], grid[4][1], grid[4][2], grid[4][3],
                                  item1, item2};
-    QCOMPARE(_paintedItems, expected);
+    QTRY_COMPARE(_paintedItems, expected);
 }
 
 void tst_QGraphicsItem::itemHasNoContents()
@@ -8339,13 +8333,7 @@ void tst_QGraphicsItem::itemHasNoContents()
 
     _paintedItems.clear();
 
-    view.viewport()->repaint();
-#ifdef Q_OS_MAC
-    // There's no difference between update() and repaint() on the Mac,
-    // so we have to process events here to make sure we get the event.
-    QTest::qWait(10);
-#endif
-
+    view.viewport()->update();
     QTRY_COMPARE(_paintedItems, GraphicsItems{item2});
 }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 1c8faa6b38..817f67540e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -245,7 +245,7 @@ void tst_QGraphicsLinearLayout::alignment()
     widget->setLayout(&layout);
 
     static const Qt::Alignment alignmentsToTest[] = {
-        (Qt::Alignment)0,
+        Qt::Alignment{},
         Qt::AlignLeft,
         Qt::AlignRight,
         Qt::AlignHCenter,
@@ -253,7 +253,7 @@ void tst_QGraphicsLinearLayout::alignment()
         Qt::AlignBottom,
         Qt::AlignVCenter,
         Qt::AlignCenter,
-        (Qt::Alignment)0,
+        Qt::Alignment{},
         Qt::AlignLeft,
         Qt::AlignRight,
         Qt::AlignHCenter,
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
index 8ed19697a4..e95cdcf7d8 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -4,6 +4,7 @@ TARGET = tst_qgraphicsview
 
 QT += widgets widgets-private testlib
 QT += core-private gui-private testlib-private
+qtConfig(opengl): QT += opengl
 
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
 HEADERS +=  tst_qgraphicsview.h
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index cf8066c7a3..d521c6f11c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -48,8 +48,8 @@
 #include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QStyle>
 #include <QtWidgets/QPushButton>
-#ifndef QT_NO_OPENGL
-#include <QtWidgets/QOpenGLWidget>
+#if QT_CONFIG(opengl)
+#include <QtOpenGL/QOpenGLWidget>
 #endif
 #include <private/qgraphicsscene_p.h>
 #include <private/qgraphicsview_p.h>
@@ -81,21 +81,21 @@ Q_DECLARE_METATYPE(ScrollBarCount)
 
 static void sendMousePress(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::LeftButton)
 {
-    QMouseEvent event(QEvent::MouseButtonPress, point, widget->mapToGlobal(point), button, 0, 0);
+    QMouseEvent event(QEvent::MouseButtonPress, point, widget->mapToGlobal(point), button, {}, {});
     QApplication::sendEvent(widget, &event);
 }
 
-static void sendMouseMove(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = 0)
+static void sendMouseMove(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = {})
 {
     QTest::mouseMove(widget, point);
-    QMouseEvent event(QEvent::MouseMove, point, widget->mapToGlobal(point), button, buttons, 0);
+    QMouseEvent event(QEvent::MouseMove, point, widget->mapToGlobal(point), button, buttons, {});
     QApplication::sendEvent(widget, &event);
     QApplication::processEvents();
 }
 
 static void sendMouseRelease(QWidget *widget, const QPoint &point, Qt::MouseButton button = Qt::LeftButton)
 {
-    QMouseEvent event(QEvent::MouseButtonRelease, point, widget->mapToGlobal(point), button, 0, 0);
+    QMouseEvent event(QEvent::MouseButtonRelease, point, widget->mapToGlobal(point), button, {}, {});
     QApplication::sendEvent(widget, &event);
 }
 
@@ -154,7 +154,7 @@ private slots:
     void sceneRect_growing();
     void setSceneRect();
     void viewport();
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
     void openGLViewport();
 #endif
     void dragMode_scrollHand();
@@ -343,7 +343,7 @@ void tst_QGraphicsView::renderHints()
     QCOMPARE(view.renderHints(), QPainter::TextAntialiasing);
     view.setRenderHint(QPainter::Antialiasing);
     QCOMPARE(view.renderHints(), QPainter::TextAntialiasing | QPainter::Antialiasing);
-    view.setRenderHints(0);
+    view.setRenderHints({});
     QCOMPARE(view.renderHints(), 0);
 
     TestItem *item = new TestItem;
@@ -358,13 +358,13 @@ void tst_QGraphicsView::renderHints()
     QCOMPARE(item->hints, 0);
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    view.repaint();
+    view.update();
     QTRY_COMPARE(item->hints, view.renderHints());
 
     view.setRenderHints(QPainter::Antialiasing);
     QCOMPARE(view.renderHints(), QPainter::Antialiasing);
 
-    view.repaint();
+    view.update();
     QTRY_COMPARE(item->hints, view.renderHints());
 }
 
@@ -380,7 +380,7 @@ void tst_QGraphicsView::alignment()
 
     for (int i = 0; i < 3; ++i) {
         for (int j = 0; j < 3; ++j) {
-            Qt::Alignment alignment = 0;
+            Qt::Alignment alignment;
             switch (i) {
             case 0:
                 alignment |= Qt::AlignLeft;
@@ -659,7 +659,7 @@ void tst_QGraphicsView::viewport()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
 void tst_QGraphicsView::openGLViewport()
 {
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL))
@@ -740,7 +740,7 @@ void tst_QGraphicsView::dragMode_scrollHand()
                 // Press
                 QMouseEvent event(QEvent::MouseButtonPress,
                                   view.viewport()->rect().center(),
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
                 event.setAccepted(true);
                 QApplication::sendEvent(view.viewport(), &event);
                 QVERIFY(event.isAccepted());
@@ -757,7 +757,7 @@ void tst_QGraphicsView::dragMode_scrollHand()
                     // Move
                     QMouseEvent event(QEvent::MouseMove,
                                       view.viewport()->rect().center() + QPoint(10, 0),
-                                      Qt::LeftButton, Qt::LeftButton, 0);
+                                      Qt::LeftButton, Qt::LeftButton, {});
                     event.setAccepted(true);
                     QApplication::sendEvent(view.viewport(), &event);
                     QVERIFY(event.isAccepted());
@@ -769,7 +769,7 @@ void tst_QGraphicsView::dragMode_scrollHand()
                     // Move
                     QMouseEvent event(QEvent::MouseMove,
                                       view.viewport()->rect().center() + QPoint(10, 10),
-                                      Qt::LeftButton, Qt::LeftButton, 0);
+                                      Qt::LeftButton, Qt::LeftButton, {});
                     event.setAccepted(true);
                     QApplication::sendEvent(view.viewport(), &event);
                     QVERIFY(event.isAccepted());
@@ -783,7 +783,7 @@ void tst_QGraphicsView::dragMode_scrollHand()
                 // Release
                 QMouseEvent event(QEvent::MouseButtonRelease,
                                   view.viewport()->rect().center() + QPoint(10, 10),
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
                 event.setAccepted(true);
                 QApplication::sendEvent(view.viewport(), &event);
                 QVERIFY(event.isAccepted());
@@ -805,14 +805,14 @@ void tst_QGraphicsView::dragMode_scrollHand()
                 // Press
                 QMouseEvent event(QEvent::MouseButtonPress,
                                   view.viewport()->rect().center() + QPoint(10, 10),
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
                 QApplication::sendEvent(view.viewport(), &event);
             }
             {
                 // Release
                 QMouseEvent event(QEvent::MouseButtonRelease,
                                   view.viewport()->rect().center() + QPoint(10, 10),
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
                 QApplication::sendEvent(view.viewport(), &event);
             }
 
@@ -862,7 +862,7 @@ void tst_QGraphicsView::dragMode_rubberBand()
             // Press
             QMouseEvent event(QEvent::MouseButtonPress,
                               view.viewport()->rect().center(),
-                              Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
             event.setAccepted(true);
             QApplication::sendEvent(view.viewport(), &event);
             QVERIFY(event.isAccepted());
@@ -877,7 +877,7 @@ void tst_QGraphicsView::dragMode_rubberBand()
             // Move
             QMouseEvent event(QEvent::MouseMove,
                               view.viewport()->rect().center() + QPoint(100, 0),
-                              Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
             event.setAccepted(true);
             QApplication::sendEvent(view.viewport(), &event);
             QVERIFY(event.isAccepted());
@@ -892,7 +892,7 @@ void tst_QGraphicsView::dragMode_rubberBand()
             // Move
             QMouseEvent event(QEvent::MouseMove,
                               view.viewport()->rect().center() + QPoint(100, 100),
-                              Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
             event.setAccepted(true);
             QApplication::sendEvent(view.viewport(), &event);
             QVERIFY(event.isAccepted());
@@ -904,7 +904,7 @@ void tst_QGraphicsView::dragMode_rubberBand()
             // Release
             QMouseEvent event(QEvent::MouseButtonRelease,
                               view.viewport()->rect().center() + QPoint(100, 100),
-                              Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
             event.setAccepted(true);
             QApplication::sendEvent(view.viewport(), &event);
             QVERIFY(event.isAccepted());
@@ -1009,7 +1009,8 @@ void tst_QGraphicsView::rubberBandExtendSelection()
    // now rubberband with modifier key
    {
       QPoint clickPoint = view.mapFromScene(20, 115);
-      QMouseEvent event(QEvent::MouseButtonPress, clickPoint, view.viewport()->mapToGlobal(clickPoint), Qt::LeftButton, 0, Qt::ControlModifier);
+      QMouseEvent event(QEvent::MouseButtonPress, clickPoint, view.viewport()->mapToGlobal(clickPoint),
+                        Qt::LeftButton, {}, Qt::ControlModifier);
       QApplication::sendEvent(view.viewport(), &event);
    }
    sendMouseMove(view.viewport(), view.mapFromScene(20, 300), Qt::LeftButton, Qt::LeftButton);
@@ -2162,14 +2163,14 @@ void tst_QGraphicsView::sendEvent()
     QCOMPARE(item->events.at(item->events.size() - 1), QEvent::GraphicsSceneMousePress);
 
     QMouseEvent mouseMoveEvent(QEvent::MouseMove, itemPoint, view.viewport()->mapToGlobal(itemPoint),
-                                Qt::LeftButton, Qt::LeftButton, 0);
+                               Qt::LeftButton, Qt::LeftButton, {});
     QApplication::sendEvent(view.viewport(), &mouseMoveEvent);
     QCOMPARE(item->events.size(), 5);
     QCOMPARE(item->events.last(), QEvent::GraphicsSceneMouseMove);
 
     QMouseEvent mouseReleaseEvent(QEvent::MouseButtonRelease, itemPoint,
                                   view.viewport()->mapToGlobal(itemPoint),
-                                  Qt::LeftButton, 0, 0);
+                                  Qt::LeftButton, {}, {});
     QApplication::sendEvent(view.viewport(), &mouseReleaseEvent);
     QCOMPARE(item->events.size(), 7);
     QCOMPARE(item->events.at(item->events.size() - 2), QEvent::GraphicsSceneMouseRelease);
@@ -2630,13 +2631,12 @@ void tst_QGraphicsView::optimizationFlags()
 class MessUpPainterItem : public QGraphicsRectItem
 {
 public:
-    MessUpPainterItem(const QRectF &rect) : QGraphicsRectItem(rect), dirtyPainter(false)
-    { }
-
-    bool dirtyPainter;
-
+    using QGraphicsRectItem::QGraphicsRectItem;
+    bool dirtyPainter = false;
+    bool receivedPaintEvent = false;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *w)
     {
+        receivedPaintEvent = true;
         dirtyPainter = (painter->pen().color() != w->palette().color(w->foregroundRole()));
         painter->setPen(Qt::red);
     }
@@ -2674,18 +2674,22 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState()
     QGraphicsView view(&scene);
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    view.viewport()->repaint();
+    parent->receivedPaintEvent = false;
+    child->receivedPaintEvent = false;
+    view.viewport()->update();
 
+    QTRY_VERIFY(parent->receivedPaintEvent);
+    QTRY_VERIFY(child->receivedPaintEvent);
     QVERIFY(!parent->dirtyPainter);
     QVERIFY(!child->dirtyPainter);
 
     view.setOptimizationFlags(QGraphicsView::DontSavePainterState);
-    view.viewport()->repaint();
+    parent->receivedPaintEvent = false;
+    child->receivedPaintEvent = false;
+    view.viewport()->update();
 
-#ifdef Q_OS_MAC
-    // Repaint on OS X actually does require spinning the event loop.
-    QTest::qWait(100);
-#endif
+    QTRY_VERIFY(parent->receivedPaintEvent);
+    QTRY_VERIFY(child->receivedPaintEvent);
     QVERIFY(!parent->dirtyPainter);
     QVERIFY(child->dirtyPainter);
 
@@ -2752,7 +2756,7 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState2()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Make sure the view is repainted; otherwise the tests below will fail.
-    view.viewport()->repaint();
+    view.viewport()->update();
     QTRY_VERIFY(view.painted);
 
     // Make sure the painter's world transform is preserved after drawItems.
@@ -3283,7 +3287,7 @@ void tst_QGraphicsView::task186827_deleteReplayedItem()
 
     QCOMPARE(view.mouseMoves, 0);
     {
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(25, 25), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(25, 25), Qt::NoButton, {}, {});
         QApplication::sendEvent(view.viewport(), &event);
     }
     QCOMPARE(view.mouseMoves, 1);
@@ -3291,7 +3295,7 @@ void tst_QGraphicsView::task186827_deleteReplayedItem()
     QTRY_COMPARE(view.mouseMoves, 1);
     QTest::qWait(25);
     {
-        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(25, 25), Qt::NoButton, 0, 0);
+        QMouseEvent event(QEvent::MouseMove, view.mapFromScene(25, 25), Qt::NoButton, {}, {});
         QApplication::sendEvent(view.viewport(), &event);
     }
     QCOMPARE(view.mouseMoves, 2);
@@ -3337,8 +3341,8 @@ void tst_QGraphicsView::task210599_unsetDragWhileDragging()
     // Enable and do a drag
     {
         view.setDragMode(QGraphicsView::ScrollHandDrag);
-        QMouseEvent press(QEvent::MouseButtonPress, origPos, Qt::LeftButton, 0, 0);
-        QMouseEvent move(QEvent::MouseMove, step1Pos, Qt::LeftButton, 0, 0);
+        QMouseEvent press(QEvent::MouseButtonPress, origPos, Qt::LeftButton, {}, {});
+        QMouseEvent move(QEvent::MouseMove, step1Pos, Qt::LeftButton, {}, {});
         QApplication::sendEvent(view.viewport(), &press);
         QApplication::sendEvent(view.viewport(), &move);
     }
@@ -3346,7 +3350,7 @@ void tst_QGraphicsView::task210599_unsetDragWhileDragging()
     // unset drag and release mouse, inverse order
     {
         view.setDragMode(QGraphicsView::NoDrag);
-        QMouseEvent release(QEvent::MouseButtonRelease, step1Pos, Qt::LeftButton, 0, 0);
+        QMouseEvent release(QEvent::MouseButtonRelease, step1Pos, Qt::LeftButton, {}, {});
         QApplication::sendEvent(view.viewport(), &release);
     }
 
@@ -3355,7 +3359,7 @@ void tst_QGraphicsView::task210599_unsetDragWhileDragging()
     // reset drag, and move mouse without holding button down.
     {
         view.setDragMode(QGraphicsView::ScrollHandDrag);
-        QMouseEvent move(QEvent::MouseMove, step2Pos, Qt::LeftButton, 0, 0);
+        QMouseEvent move(QEvent::MouseMove, step2Pos, Qt::LeftButton, {}, {});
         QApplication::sendEvent(view.viewport(), &move);
     }
 
@@ -3806,7 +3810,7 @@ void tst_QGraphicsView::mouseTracking2()
     EventSpy spy(&scene, QEvent::GraphicsSceneMouseMove);
     QCOMPARE(spy.count(), 0);
     QMouseEvent event(QEvent::MouseMove,view.viewport()->rect().center(), Qt::NoButton,
-                      Qt::MouseButtons(Qt::NoButton), 0);
+                      Qt::MouseButtons(Qt::NoButton), {});
     QApplication::sendEvent(view.viewport(), &event);
     QCOMPARE(spy.count(), 1);
 }
@@ -4731,14 +4735,12 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
     QGraphicsView view(&scene);
     view.scale(4.15, 4.15);
     view.showNormal();
-    qApp->setActiveWindow(&view);
+    QApplication::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowExposed(&view));
     QVERIFY(QTest::qWaitForWindowActive(&view));
 
-    view.viewport()->repaint(10,10,20,20);
-    QApplication::processEvents();
-
-    QCOMPARE(item.lastExposedRect, scene.lastBackgroundExposedRect);
+    view.viewport()->update(10,10,20,20);
+    QTRY_COMPARE(item.lastExposedRect, scene.lastBackgroundExposedRect);
 }
 
 #ifndef QT_NO_CURSOR
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index d3477be986..e42640c066 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -174,7 +174,7 @@ private slots:
 // Subclass that exposes the protected functions.
 class SubQGraphicsWidget : public QGraphicsWidget {
 public:
-    SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = 0)
+    SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = { })
         : QGraphicsWidget(parent, windowFlags), eventCount(0)
         { }
 
@@ -254,7 +254,7 @@ protected:
 class SizeHinter : public QGraphicsWidget
 {
 public:
-    SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0,
+    SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { },
                 const QSizeF &min = QSizeF(5,5),
                 const QSizeF &pref = QSizeF(50, 50),
                 const QSizeF &max = QSizeF(500, 500))
@@ -1186,7 +1186,7 @@ void tst_QGraphicsWidget::layoutDirection()
     for (int i = 0; i < children.count(); ++i) {
         QTRY_COMPARE(children[i]->layoutDirection(), layoutDirection);
         QTRY_COMPARE(children[i]->testAttribute(Qt::WA_SetLayoutDirection), false);
-        view->repaint();
+        view->update();
         QTRY_COMPARE(children[i]->m_painterLayoutDirection, layoutDirection);
     }
 }
@@ -2580,7 +2580,7 @@ void tst_QGraphicsWidget::shortcutsDeletion()
 class MessUpPainterWidget : public QGraphicsWidget
 {
 public:
-    MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0)
+    MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { })
     : QGraphicsWidget(parent, wFlags)
     {}