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

Change-Id: I5bdfe94f7eec1ba328c4a4b54d12dbc0da7fc3ac

28 files changed, 148 insertions, 143 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 52354eda42..a947954a4e 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -571,14 +571,15 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog()
     dialog->close();
     fd.close();
 
-    QFileDialog fd2(0, "I should not crash with a proxy", tempDir.path(), 0);
+    QFileDialog fd2(0, "I should not crash with a proxy", tempDir.path(), {});
     QSortFilterProxyModel *pm = new QSortFilterProxyModel;
     fd2.setProxyModel(pm);
     fd2.show();
     QSidebar *sidebar = fd2.findChild<QSidebar*>("sidebar");
     sidebar->setFocus();
     sidebar->selectUrl(QUrl::fromLocalFile(QDir::homePath()));
-    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(1, 0)).center());
+    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, {},
+                      sidebar->visualRect(sidebar->model()->index(1, 0)).center());
     QTest::qWait(250);
     //We shouldn't crash
 }
@@ -613,7 +614,7 @@ void tst_QFileDialog2::task227930_correctNavigationKeyboardBehavior()
     QVERIFY(list);
     QTest::keyClick(list, Qt::Key_Down);
     QTest::keyClick(list, Qt::Key_Return);
-    QTest::mouseClick(list->viewport(), Qt::LeftButton,0);
+    QTest::mouseClick(list->viewport(), Qt::LeftButton, {});
     QTest::keyClick(list, Qt::Key_Down);
     QTest::keyClick(list, Qt::Key_Backspace);
     QTest::keyClick(list, Qt::Key_Down);
@@ -972,7 +973,8 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries()
     QVERIFY(sidebar);
     sidebar->setFocus();
     sidebar->selectUrl(QUrl::fromLocalFile(hiddenSubDir.absolutePath()));
-    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center());
+    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, {},
+                      sidebar->visualRect(sidebar->model()->index(0, 0)).center());
     // give the background processes more time on windows mobile
     QTest::qWait(250);
 
@@ -1027,7 +1029,8 @@ void tst_QFileDialog2::task251341_sideBarRemoveEntries()
     sidebar->setFocus();
     //We enter in the first bookmark
     sidebar->selectUrl(QUrl::fromLocalFile(testSubDir.absolutePath()));
-    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center());
+    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, {},
+                      sidebar->visualRect(sidebar->model()->index(0, 0)).center());
 
     QFileSystemModel *model = fd.findChild<QFileSystemModel*>("qt_filesystem_model");
     QVERIFY(model);
@@ -1040,7 +1043,8 @@ void tst_QFileDialog2::task251341_sideBarRemoveEntries()
     sidebar->setFocus();
     //We enter in the second bookmark which is invalid
     sidebar->selectUrl(QUrl::fromLocalFile("NotFound"));
-    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(1, 0)).center());
+    QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, {},
+                      sidebar->visualRect(sidebar->model()->index(1, 0)).center());
 
     //We fallback to root because the entry in the bookmark is invalid
     QCOMPARE(model->rowCount(model->index("NotFound")), model->rowCount(model->index(model->rootPath())));
diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index 9c5e226731..8276d3ea9d 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -190,7 +190,8 @@ void tst_QSidebar::goToUrl()
     qsidebar.show();
 
     QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(QUrl)));
-    QTest::mousePress(qsidebar.viewport(), Qt::LeftButton, 0, qsidebar.visualRect(qsidebar.model()->index(0, 0)).center());
+    QTest::mousePress(qsidebar.viewport(), Qt::LeftButton, {},
+                      qsidebar.visualRect(qsidebar.model()->index(0, 0)).center());
 #ifdef Q_OS_WINRT
     QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort);
 #endif
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 7fda59a29b..dae274a8b6 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -238,7 +238,7 @@ void tst_QWizard::setButtonLayout()
 
     QWizard wizard;
     wizard.setWizardStyle(QWizard::ClassicStyle);
-    wizard.setOptions(0);
+    wizard.setOptions({});
     wizard.setButtonLayout(layout);
     wizard.show();
     qApp->processEvents();
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 5a9ba5c9d3..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;
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/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index cf8066c7a3..4a33665cb9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -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);
 }
 
@@ -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;
@@ -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;
@@ -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);
@@ -3283,7 +3284,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 +3292,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 +3338,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 +3347,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 +3356,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 +3807,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);
 }
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 1d0153213b..544069243f 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -1299,7 +1299,7 @@ void tst_QTableView::moveCursorStrikesBack()
     int newRow = -1;
     int newColumn = -1;
     for (auto cursorMoveAction : cursorMoveActions) {
-        QModelIndex newIndex = view.moveCursor(cursorMoveAction, nullptr);
+        QModelIndex newIndex = view.moveCursor(cursorMoveAction, {});
         view.setCurrentIndex(newIndex);
         newRow = newIndex.row();
         newColumn = newIndex.column();
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 9750a31824..d332c7e291 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -4918,7 +4918,7 @@ void tst_QTreeView::taskQTBUG_61476()
         QEvent::MouseButtonPress)
         QTRY_VERIFY(!tv.isExpanded(mi));
 
-    QTest::mouseRelease(tv.viewport(), Qt::LeftButton, nullptr, pos);
+    QTest::mouseRelease(tv.viewport(), Qt::LeftButton, {}, pos);
     QTRY_VERIFY(!tv.isExpanded(mi));
     QCOMPARE(lastTopLevel->checkState(), Qt::Checked);
 }
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 00bde3cb25..cbfbefaf3c 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -415,7 +415,7 @@ public:
     QSize minimumSize() const { return QSize(m_descr.minimumSize, 0); }
     QSize maximumSize() const { return QSize(m_descr.maximumSize, QLAYOUTSIZE_MAX); }
     Qt::Orientations expandingDirections() const
-        { return m_descr.expanding ? Qt::Horizontal :  Qt::Orientations(0); }
+    { return m_descr.expanding ? Qt::Horizontal :  Qt::Orientations{}; }
     void setGeometry(const QRect &r) { m_pos = r.x(); m_size = r.width();}
     QRect geometry() const { return QRect(m_pos, 0, m_size, 100); }
     bool isEmpty() const { return m_descr.empty; }
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 140a367afe..c8fe1841c8 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -163,7 +163,7 @@ void tst_QLayout::smartMaxSize()
                                         QSizePolicy::MinimumExpanding,
                                         QSizePolicy::Ignored
                                         };
-    Qt::Alignment alignments[] = {  0,
+    Qt::Alignment alignments[] = {  Qt::Alignment{},
                                     Qt::AlignLeft,
                                     Qt::AlignRight,
                                     Qt::AlignHCenter
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index 7d114fde56..dd3e2f844b 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -845,12 +845,12 @@ void tst_QWidget_window::tst_dnd_propagation()
     auto posInsideLabel      = QHighDpi::toNativePixels(QPoint(60, 60), window->screen());
 
     // Enter DropTarget.
-    QWindowSystemInterface::handleDrag(window, &mimeData, posInsideDropTarget, supportedActions, 0, 0);
+    QWindowSystemInterface::handleDrag(window, &mimeData, posInsideDropTarget, supportedActions, {}, {});
     // Enter QLabel. This will propagate because default QLabel does
     // not accept the drop event in dragEnterEvent().
-    QWindowSystemInterface::handleDrag(window, &mimeData, posInsideLabel, supportedActions, 0, 0);
+    QWindowSystemInterface::handleDrag(window, &mimeData, posInsideLabel, supportedActions, {}, {});
     // Drop on QLabel. DropTarget will get dropEvent(), because it accepted the event.
-    QWindowSystemInterface::handleDrop(window, &mimeData, posInsideLabel, supportedActions, 0, 0);
+    QWindowSystemInterface::handleDrop(window, &mimeData, posInsideLabel, supportedActions, {}, {});
 
     QGuiApplication::processEvents();
 
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index f77efe036a..c54a6bb73e 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -1836,9 +1836,10 @@ void tst_QAbstractSlider::sliderPressedReleased()
     if (qApp->style()->styleHint(QStyle::SH_ScrollBar_LeftClickAbsolutePosition))
         QSKIP("The result depends on system setting on mac");
 
-    QTest::mousePress(slider, Qt::LeftButton, 0, QPoint(rect.center().x() + 2, rect.center().y() + 2));
+    QTest::mousePress(slider, Qt::LeftButton, {},
+                      QPoint(rect.center().x() + 2, rect.center().y() + 2));
     QCOMPARE(spy1.count(), expectedCount);
-    QTest::mouseRelease(slider, Qt::LeftButton, 0, rect.center());
+    QTest::mouseRelease(slider, Qt::LeftButton, {}, rect.center());
     QCOMPARE(spy2.count(), expectedCount);
 
     delete slider;
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index cab13092cb..ea1b330152 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -837,16 +837,16 @@ void tst_QComboBox::virtualAutocompletion()
     // well, and send a keypress & keyrelease right after each other.
     // This provokes the actual error, as there's no events in between to do
     // the text completion.
-    QKeyEvent kp1(QEvent::KeyPress, Qt::Key_B, 0, "b");
-    QKeyEvent kr1(QEvent::KeyRelease, Qt::Key_B, 0, "b");
+    QKeyEvent kp1(QEvent::KeyPress, Qt::Key_B, {}, "b");
+    QKeyEvent kr1(QEvent::KeyRelease, Qt::Key_B, {}, "b");
     QApplication::sendEvent(testWidget, &kp1);
     QApplication::sendEvent(testWidget, &kr1);
 
     qApp->processEvents(); // Process events to trigger autocompletion
     QTRY_COMPARE(testWidget->currentIndex(), 1);
 
-    QKeyEvent kp2(QEvent::KeyPress, Qt::Key_O, 0, "o");
-    QKeyEvent kr2(QEvent::KeyRelease, Qt::Key_O, 0, "o");
+    QKeyEvent kp2(QEvent::KeyPress, Qt::Key_O, {}, "o");
+    QKeyEvent kr2(QEvent::KeyRelease, Qt::Key_O, {}, "o");
 
     QApplication::sendEvent(testWidget, &kp2);
     QApplication::sendEvent(testWidget, &kr2);
@@ -1722,7 +1722,7 @@ void tst_QComboBox::setCustomModelAndView()
     // why this happens.
     QTest::qWait(QApplication::doubleClickInterval());
 
-    QTest::mouseClick(window->windowHandle(), Qt::LeftButton, 0, view->mapTo(window, subItemRect.center()));
+    QTest::mouseClick(window->windowHandle(), Qt::LeftButton, {}, view->mapTo(window, subItemRect.center()));
 #ifdef Q_OS_WINRT
     QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort);
 #endif
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index aba4651379..264625777f 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2303,7 +2303,7 @@ void tst_QDateTimeEdit::mousePress()
     QRect rectUp = testWidget->style()->subControlRect(QStyle::CC_SpinBox, &so, QStyle::SC_SpinBoxUp, testWidget);
 
     // Send mouseClick to center of SC_SpinBoxUp
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, rectUp.center());
+    QTest::mouseClick(testWidget, Qt::LeftButton, {}, rectUp.center());
     QCOMPARE(testWidget->date().year(), 2005);
 }
 
@@ -2916,7 +2916,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.editable = true;
     opt.subControls = QStyle::SC_ComboBoxArrow;
     QRect rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, testWidget);
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(testWidget, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid = testWidget->findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(wid != 0);
     testWidget->hide();
@@ -2928,7 +2929,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.initFrom(&timeEdit);
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &timeEdit);
-    QTest::mouseClick(&timeEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(&timeEdit, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid2 = timeEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(!wid2);
     timeEdit.hide();
@@ -2942,7 +2944,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.initFrom(&dateEdit);
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &dateEdit);
-    QTest::mouseClick(&dateEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(&dateEdit, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid3 = dateEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(!wid3);
     dateEdit.hide();
diff --git a/tests/auto/widgets/widgets/qdial/tst_qdial.cpp b/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
index 7db3b44dc8..356f773ae9 100644
--- a/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
+++ b/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
@@ -98,7 +98,7 @@ void tst_QDial::sliderMoved()
     QPoint init(dial.width()/4, dial.height()/2);
 
     QMouseEvent pressevent(QEvent::MouseButtonPress, init,
-        Qt::LeftButton, Qt::LeftButton, 0);
+                           Qt::LeftButton, Qt::LeftButton, {});
     qApp->sendEvent(&dial, &pressevent);
 
     QSignalSpy sliderspy(&dial, SIGNAL(sliderMoved(int)));
@@ -108,7 +108,7 @@ void tst_QDial::sliderMoved()
     { //move on top of the slider
         init = QPoint(dial.width()/2, dial.height()/4);
         QMouseEvent moveevent(QEvent::MouseMove, init,
-            Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
         qApp->sendEvent(&dial, &moveevent);
         QCOMPARE( sliderspy.count(), 1);
         QCOMPARE( valuespy.count(), 0);
@@ -118,14 +118,14 @@ void tst_QDial::sliderMoved()
     { //move on the right of the slider
         init = QPoint(dial.width()*3/4, dial.height()/2);
         QMouseEvent moveevent(QEvent::MouseMove, init,
-            Qt::LeftButton, Qt::LeftButton, 0);
+                              Qt::LeftButton, Qt::LeftButton, {});
         qApp->sendEvent(&dial, &moveevent);
         QCOMPARE( sliderspy.count(), 2);
         QCOMPARE( valuespy.count(), 0);
     }
 
     QMouseEvent releaseevent(QEvent::MouseButtonRelease, init,
-        Qt::LeftButton, Qt::LeftButton, 0);
+                             Qt::LeftButton, Qt::LeftButton, {});
     qApp->sendEvent(&dial, &releaseevent);
     QCOMPARE( valuespy.count(), 1); // valuechanged signal should be called at this point
 
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 7e0cb99ea8..6a2c8893d2 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -163,7 +163,7 @@ void tst_QDialogButtonBox::testConstructor3_data()
     QTest::addColumn<QDialogButtonBox::StandardButtons>("buttons");
     QTest::addColumn<int>("buttonCount");
 
-    QTest::newRow("nothing") << int(Qt::Horizontal) << (QDialogButtonBox::StandardButtons)0 << 0;
+    QTest::newRow("nothing") << int(Qt::Horizontal) << QDialogButtonBox::StandardButtons{} << 0;
     QTest::newRow("only 1") << int(Qt::Horizontal) << QDialogButtonBox::StandardButtons(QDialogButtonBox::Ok) << 1;
     QTest::newRow("only 1.. twice") << int(Qt::Horizontal)
                         << (QDialogButtonBox::Ok | QDialogButtonBox::Ok)
@@ -199,7 +199,7 @@ void tst_QDialogButtonBox::testConstructor4_data()
     QTest::addColumn<QDialogButtonBox::StandardButtons>("buttons");
     QTest::addColumn<int>("buttonCount");
 
-    QTest::newRow("nothing") << (QDialogButtonBox::StandardButtons)0 << 0;
+    QTest::newRow("nothing") << QDialogButtonBox::StandardButtons{} << 0;
     QTest::newRow("only 1") << QDialogButtonBox::StandardButtons(QDialogButtonBox::Ok) << 1;
     QTest::newRow("only 1.. twice")
                         << (QDialogButtonBox::Ok | QDialogButtonBox::Ok)
diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index bf14020b24..4fb5d262ca 100644
--- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -387,7 +387,7 @@ void tst_QGroupBox::clicked()
                                                     QStyle::SubControl(areaToHit), &testWidget);
 
     if (rect.isValid())
-        QTest::mouseClick(&testWidget, Qt::LeftButton, 0, rect.center());
+        QTest::mouseClick(&testWidget, Qt::LeftButton, {}, rect.center());
     else
         QTest::mouseClick(&testWidget, Qt::LeftButton);
 
@@ -420,7 +420,7 @@ void tst_QGroupBox::toggledVsClicked()
     QRect rect = groupBox.style()->subControlRect(QStyle::CC_GroupBox, &option,
                                                   QStyle::SC_GroupBoxCheckBox, &groupBox);
 
-    QTest::mouseClick(&groupBox, Qt::LeftButton, 0, rect.center());
+    QTest::mouseClick(&groupBox, Qt::LeftButton, {}, rect.center());
     QCOMPARE(clickSpy.count(), 1);
     QCOMPARE(toggleSpy.count(), 2);
     QVERIFY(toggleTimeStamp < clickTimeStamp);
@@ -500,11 +500,11 @@ void tst_QGroupBox::task_QTBUG_19170_ignoreMouseReleaseEvent()
     QRect rect = box.style()->subControlRect(QStyle::CC_GroupBox, &option,
                                              QStyle::SC_GroupBoxCheckBox, &box);
 
-    QTest::mouseClick(&box, Qt::LeftButton, 0, rect.center());
+    QTest::mouseClick(&box, Qt::LeftButton, {}, rect.center());
     QCOMPARE(box.isChecked(), true);
 
     box.setChecked(false);
-    QTest::mouseRelease(&box, Qt::LeftButton, 0, rect.center());
+    QTest::mouseRelease(&box, Qt::LeftButton, {}, rect.center());
     QCOMPARE(box.isChecked(), false);
 }
 
@@ -558,19 +558,19 @@ void tst_QGroupBox::task_QTBUG_15519_propagateMouseEvents()
     // Without a checkbox, all mouse events should propagate
 
     parent.reset();
-    QTest::mousePress(&box, Qt::LeftButton, 0, checkBoxRect.center());
+    QTest::mousePress(&box, Qt::LeftButton, {}, checkBoxRect.center());
     QCOMPARE(parent.mousePressed, true);
 
     parent.reset();
-    QTest::mousePress(&box, Qt::LeftButton, 0, box.rect().center());
+    QTest::mousePress(&box, Qt::LeftButton, {}, box.rect().center());
     QCOMPARE(parent.mousePressed, true);
 
     parent.reset();
-    QTest::mouseRelease(&box, Qt::LeftButton, 0, checkBoxRect.center());
+    QTest::mouseRelease(&box, Qt::LeftButton, {}, checkBoxRect.center());
     QCOMPARE(parent.mouseReleased, true);
 
     parent.reset();
-    QTest::mouseRelease(&box, Qt::LeftButton, 0, box.rect().center());
+    QTest::mouseRelease(&box, Qt::LeftButton, {}, box.rect().center());
     QCOMPARE(parent.mouseReleased, true);
 
     parent.reset();
@@ -586,19 +586,19 @@ void tst_QGroupBox::task_QTBUG_15519_propagateMouseEvents()
     box.setCheckable(true);
 
     parent.reset();
-    QTest::mousePress(&box, Qt::LeftButton, 0, checkBoxRect.center());
+    QTest::mousePress(&box, Qt::LeftButton, {}, checkBoxRect.center());
     QCOMPARE(parent.mousePressed, false);
 
     parent.reset();
-    QTest::mousePress(&box, Qt::LeftButton, 0, box.rect().center());
+    QTest::mousePress(&box, Qt::LeftButton, {}, box.rect().center());
     QCOMPARE(parent.mousePressed, true);
 
     parent.reset();
-    QTest::mouseRelease(&box, Qt::LeftButton, 0, checkBoxRect.center());
+    QTest::mouseRelease(&box, Qt::LeftButton, {}, checkBoxRect.center());
     QCOMPARE(parent.mouseReleased, false);
 
     parent.reset();
-    QTest::mouseRelease(&box, Qt::LeftButton, 0, box.rect().center());
+    QTest::mouseRelease(&box, Qt::LeftButton, {}, box.rect().center());
     QCOMPARE(parent.mouseReleased, true);
 
     parent.reset();
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 957b3dfb47..bbf7e27a7a 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -322,8 +322,8 @@ protected slots:
 
 private:
     // keyClicks(..) is moved to QtTestCase
-    void psKeyClick(QWidget *target, Qt::Key key, Qt::KeyboardModifiers pressState = 0);
-    void psKeyClick(QTestEventList &keys, Qt::Key key, Qt::KeyboardModifiers pressState = 0);
+    void psKeyClick(QWidget *target, Qt::Key key, Qt::KeyboardModifiers pressState = {});
+    void psKeyClick(QTestEventList &keys, Qt::Key key, Qt::KeyboardModifiers pressState = {});
     bool unselectingWithLeftOrRightChangesCursorPosition();
 #if QT_CONFIG(shortcut)
     void addKeySequenceStandardKey(QTestEventList &keys, QKeySequence::StandardKey);
@@ -2296,7 +2296,7 @@ void tst_QLineEdit::deleteSelectedText()
 
     edit.selectAll();
 
-    QTest::keyClick(&edit, Qt::Key_Delete, 0);
+    QTest::keyClick(&edit, Qt::Key_Delete, {});
     QVERIFY(edit.text().isEmpty());
 
     edit.setText(text);
@@ -3596,7 +3596,7 @@ void tst_QLineEdit::textMargin()
     QCOMPARE(bottom, b);
 #endif
 
-    QTest::mouseClick(&testWidget, Qt::LeftButton, 0, mousePressPos);
+    QTest::mouseClick(&testWidget, Qt::LeftButton, {}, mousePressPos);
     QTRY_COMPARE(testWidget.cursorPosition(), cursorPosition);
 }
 
@@ -4510,7 +4510,7 @@ void tst_QLineEdit::clearButton()
     QTRY_COMPARE(filterModel->rowCount(), 1); // matches 'ab'
     QSignalSpy spyEdited(filterLineEdit, &QLineEdit::textEdited);
     const QPoint clearButtonCenterPos = QRect(QPoint(0, 0), clearButton->size()).center();
-    QTest::mouseClick(clearButton, Qt::LeftButton, 0, clearButtonCenterPos);
+    QTest::mouseClick(clearButton, Qt::LeftButton, {}, clearButtonCenterPos);
     QCOMPARE(spyEdited.count(), 1);
     QTRY_COMPARE(clearButton->cursor().shape(), filterLineEdit->cursor().shape());
     QTRY_COMPARE(filterModel->rowCount(), 3);
@@ -4555,7 +4555,7 @@ void tst_QLineEdit::clearButtonVisibleAfterSettingText_QTBUG_45518()
     QTRY_VERIFY(clearButton->opacity() > 0);
     QTRY_COMPARE(clearButton->cursor().shape(), Qt::ArrowCursor);
 
-    QTest::mouseClick(clearButton, Qt::LeftButton, nullptr, clearButton->rect().center());
+    QTest::mouseClick(clearButton, Qt::LeftButton, {}, clearButton->rect().center());
     QTRY_COMPARE(edit.text(), QString());
 
     QTRY_COMPARE(clearButton->opacity(), qreal(0));
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 17eb281408..01d625d091 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -67,13 +67,13 @@ public:
     }
     void timerEvent(QTimerEvent*)
     {
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseButtonPress, QPoint(6, 7), Qt::LeftButton, 0, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(7, 8), Qt::LeftButton, Qt::LeftButton, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(27, 23), Qt::LeftButton, Qt::LeftButton, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(30, 27), Qt::LeftButton, Qt::LeftButton, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(162, 109), Qt::LeftButton, Qt::LeftButton, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(10, 4), Qt::LeftButton, Qt::LeftButton, 0));
-        qApp->postEvent(m_tb, new QMouseEvent(QEvent::MouseButtonRelease, QPoint(9, 4), Qt::LeftButton, 0, 0));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseButtonPress, QPoint(6, 7), Qt::LeftButton, {}, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(7, 8), Qt::LeftButton, Qt::LeftButton, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(27, 23), Qt::LeftButton, Qt::LeftButton, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(30, 27), Qt::LeftButton, Qt::LeftButton, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(162, 109), Qt::LeftButton, Qt::LeftButton, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseMove, QPoint(10, 4), Qt::LeftButton, Qt::LeftButton, {}));
+        QCoreApplication::postEvent(m_tb, new QMouseEvent(QEvent::MouseButtonRelease, QPoint(9, 4), Qt::LeftButton, {}, {}));
     }
 };
 
@@ -91,8 +91,8 @@ public:
 
     void timerEvent(QTimerEvent*)
     {
-        qApp->postEvent(m_w, new QMouseEvent(QEvent::MouseButtonPress, QPoint(230, 370), Qt::LeftButton, 0, 0));
-        qApp->postEvent(m_w, new QMouseEvent(QEvent::MouseButtonRelease, QPoint(230, 370), Qt::LeftButton, 0, 0));
+        QCoreApplication::postEvent(m_w, new QMouseEvent(QEvent::MouseButtonPress, QPoint(230, 370), Qt::LeftButton, {}, {}));
+        QCoreApplication::postEvent(m_w, new QMouseEvent(QEvent::MouseButtonRelease, QPoint(230, 370), Qt::LeftButton, {}, {}));
     }
 };
 
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 9fe8cd8109..e3b046e448 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -331,7 +331,7 @@ void tst_QMdiArea::subWindowActivated()
     int i;
 
     for ( i = 0; i < count; ++i ) {
-        QWidget *widget = new QWidget(workspace, 0);
+        QWidget *widget = new QWidget(workspace, {});
         widget->setAttribute(Qt::WA_DeleteOnClose);
         widget->setFocus();
         workspace->addSubWindow(widget)->show();
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 823084ee43..2d74c20469 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -319,12 +319,12 @@ void tst_QMenu::mouseActivation()
     menu.addAction("Menu Action");
     menu.move(topLevel.geometry().topRight() + QPoint(50, 0));
     menu.show();
-    QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300);
+    QTest::mouseClick(&menu, Qt::LeftButton, {}, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
 
     //context menus can always be accessed with right click except on windows
     menu.show();
-    QTest::mouseClick(&menu, Qt::RightButton, 0, menu.rect().center(), 300);
+    QTest::mouseClick(&menu, Qt::RightButton, {}, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
 
 #ifdef Q_OS_WIN
@@ -643,7 +643,7 @@ void tst_QMenu::tearOff()
     MenuMetrics mm(menu.data());
     const int tearOffOffset = mm.fw + mm.vmargin + mm.tearOffHeight / 2;
 
-    QTest::mouseClick(menu.data(), Qt::LeftButton, 0, QPoint(10, tearOffOffset), 10);
+    QTest::mouseClick(menu.data(), Qt::LeftButton, {}, QPoint(10, tearOffOffset), 10);
     QTRY_VERIFY(menu->isTearOffMenuVisible());
     QPointer<QMenu> torn = getTornOffMenu();
     QVERIFY(torn);
@@ -723,7 +723,7 @@ void tst_QMenu::submenuTearOffDontClose()
     const QPoint submenuPos(submenuRect.topLeft() + QPoint(3, 3));
     // Move then click to avoid the submenu moves from causing it to close
     QTest::mouseMove(menu, submenuPos, 100);
-    QTest::mouseClick(menu, Qt::LeftButton, 0, submenuPos, 100);
+    QTest::mouseClick(menu, Qt::LeftButton, {}, submenuPos, 100);
     QVERIFY(QTest::qWaitFor([&]() { return submenu->window()->windowHandle(); }));
     QVERIFY(QTest::qWaitForWindowActive(submenu));
     // Make sure we enter the submenu frame directly on the tear-off area
@@ -888,7 +888,7 @@ void tst_QMenu::task176201_clear()
     QAction *action = menu.addAction("test");
     menu.connect(action, SIGNAL(triggered()), SLOT(clear()));
     menu.popup(QPoint());
-    QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center());
+    QTest::mouseClick(&menu, Qt::LeftButton, {}, menu.rect().center());
 }
 
 void tst_QMenu::task250673_activeMultiColumnSubMenuPosition()
@@ -1212,13 +1212,13 @@ void tst_QMenu::click_while_dismissing_submenu()
     QVERIFY(sub.isVisible());
     QVERIFY(QTest::qWaitForWindowExposed(&sub));
     //press over the submenu entry
-    QTest::mousePress(menuWindow, Qt::LeftButton, 0, menu.rect().center() + QPoint(0,2), 300);
+    QTest::mousePress(menuWindow, Qt::LeftButton, {}, menu.rect().center() + QPoint(0, 2), 300);
     //move over the main action
     QTest::mouseMove(menuWindow, menu.rect().center() - QPoint(0,2));
     QVERIFY(menuHiddenSpy.wait());
     //the submenu must have been hidden for the bug to be triggered
     QVERIFY(!sub.isVisible());
-    QTest::mouseRelease(menuWindow, Qt::LeftButton, 0, menu.rect().center() - QPoint(0,2), 300);
+    QTest::mouseRelease(menuWindow, Qt::LeftButton, {}, menu.rect().center() - QPoint(0, 2), 300);
     QCOMPARE(spy.count(), 1);
 }
 #endif
@@ -1476,7 +1476,7 @@ void tst_QMenu::QTBUG_56917_wideSubmenuScreenNumber()
         menu.popup(screen->geometry().center());
         QVERIFY(QTest::qWaitForWindowExposed(&menu));
         QVERIFY(menu.isVisible());
-        QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.actionGeometry(action).center());
+        QTest::mouseClick(&menu, Qt::LeftButton, {}, menu.actionGeometry(action).center());
         QTest::qWait(100);
         QVERIFY(QTest::qWaitForWindowExposed(&submenu));
         QVERIFY(submenu.isVisible());
@@ -1688,7 +1688,7 @@ void tst_QMenu::tearOffMenuNotDisplayed()
     MenuMetrics mm(menu.data());
     const int tearOffOffset = mm.fw + mm.vmargin + mm.tearOffHeight / 2;
 
-    QTest::mouseClick(menu.data(), Qt::LeftButton, 0, QPoint(10, tearOffOffset), 10);
+    QTest::mouseClick(menu.data(), Qt::LeftButton, {}, QPoint(10, tearOffOffset), 10);
     QTRY_VERIFY(menu->isTearOffMenuVisible());
     QPointer<QMenu> torn = getTornOffMenu();
     QVERIFY(torn);
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 8b372a78cf..8cbe821a68 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -1267,7 +1267,7 @@ void tst_QMenuBar::check_menuPosition()
         const QPoint bottomRight = mb->actionGeometry(menu.menuAction()).bottomRight() - QPoint(1, 1);
         const QPoint localPos = widgetToWindowPos(mb, bottomRight);
         const QPoint globalPos = w.mapToGlobal(localPos);
-        QTest::mouseClick(w.windowHandle(), Qt::LeftButton, 0, localPos);
+        QTest::mouseClick(w.windowHandle(), Qt::LeftButton, {}, localPos);
         QTRY_VERIFY(menu.isActiveWindow());
         QCOMPARE(menu.geometry().right() - 1, globalPos.x());
         menu.close();
@@ -1332,9 +1332,9 @@ void tst_QMenuBar::task256322_highlight()
 
     const QPoint filePos = menuBarActionWindowPos(win.menuBar(), file);
     QWindow *window = win.windowHandle();
-    QTest::mousePress(window, Qt::LeftButton, 0, filePos);
+    QTest::mousePress(window, Qt::LeftButton, {}, filePos);
     QTest::mouseMove(window, filePos);
-    QTest::mouseRelease(window, Qt::LeftButton, 0, filePos);
+    QTest::mouseRelease(window, Qt::LeftButton, {}, filePos);
     QTRY_VERIFY(menu.isVisible());
     QVERIFY(!menu2.isVisible());
     QCOMPARE(win.menuBar()->activeAction(), file);
@@ -1507,11 +1507,11 @@ void tst_QMenuBar::closeOnSecondClickAndOpenOnThirdClick() // QTBUG-32807, menu
 
     QWindow *window = mainWindow.windowHandle();
     QTest::mouseMove(window, center);
-    QTest::mouseClick(window, Qt::LeftButton, 0, center);
+    QTest::mouseClick(window, Qt::LeftButton, {}, center);
     QTRY_VERIFY(fileMenu->isVisible());
-    QTest::mouseClick(window, Qt::LeftButton, 0, fileMenu->mapFromGlobal(globalPos));
+    QTest::mouseClick(window, Qt::LeftButton, {}, fileMenu->mapFromGlobal(globalPos));
     QTRY_VERIFY(!fileMenu->isVisible());
-    QTest::mouseClick(window, Qt::LeftButton, 0, center);
+    QTest::mouseClick(window, Qt::LeftButton, {}, center);
     QTRY_VERIFY(fileMenu->isVisible());
 }
 
@@ -1600,12 +1600,12 @@ void tst_QMenuBar::taskQTBUG53205_crashReparentNested()
     QApplication::setActiveWindow(&mainWindow);
 
     // they can't be windows
-    QWidget hiddenParent(&mainWindow, 0);
+    QWidget hiddenParent(&mainWindow, {});
     //this one is going to be moved around
-    QWidget movingParent(&hiddenParent, 0);
+    QWidget movingParent(&hiddenParent, {});
 
     //set up the container widget
-    QWidget containerWidget(&movingParent,0);
+    QWidget containerWidget(&movingParent, {});
 
     //set the new parent, a window
     QScopedPointer<QWidget> windowedParent;
@@ -1616,7 +1616,7 @@ void tst_QMenuBar::taskQTBUG53205_crashReparentNested()
     QVERIFY(QTest::qWaitForWindowExposed(windowedParent.data()));
 
     //set the "container", can't be a window
-    QWidget containedWidget(&containerWidget, 0);
+    QWidget containedWidget(&containerWidget, {});
 
     taskQTBUG53205MenuBar = new QMenuBar(&containedWidget);
 
@@ -1624,13 +1624,13 @@ void tst_QMenuBar::taskQTBUG53205_crashReparentNested()
     //now, move things around
     //from : QMainWindow<-hiddenParent<-movingParent<-containerWidget<-containedWidget<-menuBar
     //to windowedParent<-movingParent<-containerWidget<-containedWidget<-menuBar
-    movingParent.setParent(windowedParent.data(),0);
+    movingParent.setParent(windowedParent.data(), {});
     // this resets the parenting and the menu bar's window
     taskQTBUG53205MenuBar->setParent(nullptr);
     taskQTBUG53205MenuBar->setParent(&containedWidget);
     //from windowedParent<-movingParent<-containerWidget<-containedWidget<-menuBar
     //to : QMainWindow<-hiddenParent<-movingParent<-containerWidget<-containedWidget<-menuBar
-    movingParent.setParent(&hiddenParent,0);
+    movingParent.setParent(&hiddenParent, {});
     windowedParent.reset(); //make the old window invalid
     // trigger the aciton,  reset the menu bar's window, this used to crash here.
     testMenus.actions[0]->trigger();
diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
index 339ff293f4..2452bc34c5 100644
--- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
@@ -120,11 +120,11 @@ void tst_QScrollBar::task_209492()
     const QPoint pressPoint(verticalScrollBar->width() / 2, verticalScrollBar->height() - 10);
     const QPoint globalPressPoint = verticalScrollBar->mapToGlobal(globalPressPoint);
     QMouseEvent mousePressEvent(QEvent::MouseButtonPress, pressPoint, globalPressPoint,
-                                Qt::LeftButton, Qt::LeftButton, 0);
+                                Qt::LeftButton, Qt::LeftButton, {});
     QApplication::sendEvent(verticalScrollBar, &mousePressEvent);
     QTest::qWait(1);
     QMouseEvent mouseReleaseEvent(QEvent::MouseButtonRelease, pressPoint, globalPressPoint,
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
     QApplication::sendEvent(verticalScrollBar, &mouseReleaseEvent);
 
     // Check that the action was triggered once.
@@ -189,11 +189,11 @@ void tst_QScrollBar::QTBUG_42871()
     const QPoint pressPoint(scrollBarWidget.width() / 2, scrollBarWidget.height() - 10);
     const QPoint globalPressPoint = scrollBarWidget.mapToGlobal(pressPoint);
     QMouseEvent mousePressEvent(QEvent::MouseButtonPress, pressPoint, globalPressPoint,
-                                Qt::LeftButton, Qt::LeftButton, 0);
+                                Qt::LeftButton, Qt::LeftButton, {});
     QApplication::sendEvent(&scrollBarWidget, &mousePressEvent);
     QTest::qWait(1);
     QMouseEvent mouseReleaseEvent(QEvent::MouseButtonRelease, pressPoint, globalPressPoint,
-                                  Qt::LeftButton, Qt::LeftButton, 0);
+                                  Qt::LeftButton, Qt::LeftButton, {});
     QApplication::sendEvent(&scrollBarWidget, &mouseReleaseEvent);
     // Check that the action was triggered once.
     QCOMPARE(myHandler.updatesCount, 1);
diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
index 550cca8145..11effcfa93 100644
--- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
@@ -605,7 +605,7 @@ void tst_QTabBar::changeTitleWhileDoubleClickingTab()
     QPoint tabPos = bar.tabRect(0).center();
 
     for(int i=0; i < 10; i++)
-        QTest::mouseDClick(&bar, Qt::LeftButton, 0, tabPos);
+        QTest::mouseDClick(&bar, Qt::LeftButton, {}, tabPos);
 }
 
 class Widget10052 : public QWidget
@@ -655,12 +655,12 @@ void tst_QTabBar::tabBarClicked()
     while (button <= Qt::MaxMouseButton) {
         const QPoint tabPos = tabBar.tabRect(0).center();
 
-        QTest::mouseClick(&tabBar, button, 0, tabPos);
+        QTest::mouseClick(&tabBar, button, {}, tabPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
         QCOMPARE(doubleClickSpy.count(), 0);
 
-        QTest::mouseDClick(&tabBar, button, 0, tabPos);
+        QTest::mouseDClick(&tabBar, button, {}, tabPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
         QCOMPARE(doubleClickSpy.count(), 1);
@@ -668,12 +668,12 @@ void tst_QTabBar::tabBarClicked()
 
         const QPoint barPos(tabBar.tabRect(0).right() + 5, tabBar.tabRect(0).center().y());
 
-        QTest::mouseClick(&tabBar, button, 0, barPos);
+        QTest::mouseClick(&tabBar, button, {}, barPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
         QCOMPARE(doubleClickSpy.count(), 0);
 
-        QTest::mouseDClick(&tabBar, button, 0, barPos);
+        QTest::mouseDClick(&tabBar, button, {}, barPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
         QCOMPARE(doubleClickSpy.count(), 1);
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index a37042aeca..ec550b445c 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -668,12 +668,12 @@ void tst_QTabWidget::tabBarClicked()
     while (button <= Qt::MaxMouseButton) {
         const QPoint tabPos = tabBar.tabRect(0).center();
 
-        QTest::mouseClick(&tabBar, button, 0, tabPos);
+        QTest::mouseClick(&tabBar, button, {}, tabPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
         QCOMPARE(doubleClickSpy.count(), 0);
 
-        QTest::mouseDClick(&tabBar, button, 0, tabPos);
+        QTest::mouseDClick(&tabBar, button, {}, tabPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
         QCOMPARE(doubleClickSpy.count(), 1);
@@ -681,12 +681,12 @@ void tst_QTabWidget::tabBarClicked()
 
         const QPoint barPos(tabBar.tabRect(0).right() + 5, tabBar.tabRect(0).center().y());
 
-        QTest::mouseClick(&tabBar, button, 0, barPos);
+        QTest::mouseClick(&tabBar, button, {}, barPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
         QCOMPARE(doubleClickSpy.count(), 0);
 
-        QTest::mouseDClick(&tabBar, button, 0, barPos);
+        QTest::mouseDClick(&tabBar, button, {}, barPos);
         QCOMPARE(clickSpy.count(), 1);
         QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
         QCOMPARE(doubleClickSpy.count(), 1);
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index cfd8132d46..485a0b0f93 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -760,7 +760,7 @@ void tst_QTextEdit::cursorPositionChanged()
     ed->setTextCursor(cursor);
     spy.clear();
     QVERIFY(!ed->textCursor().hasSelection());
-    QTest::mouseDClick(ed->viewport(), Qt::LeftButton, 0, ed->cursorRect().center());
+    QTest::mouseDClick(ed->viewport(), Qt::LeftButton, {}, ed->cursorRect().center());
     QVERIFY(ed->textCursor().hasSelection());
 
     QCOMPARE(spy.count(), 1);
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index 1e71f92361..1d5ac7c819 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -553,7 +553,7 @@ void tst_QToolBar::actionGeometry()
         QToolBarExtension *extension = extensions.at(0);
         if (extension->isVisible()) {
             QRect rect0 = extension->geometry();
-            QTest::mouseClick( extension, Qt::LeftButton, 0, rect0.center(), -1 );
+            QTest::mouseClick( extension, Qt::LeftButton, {}, rect0.center(), -1 );
             QApplication::processEvents();
             popupMenu = qobject_cast<QMenu *>(extension->menu());
             rect01 = popupMenu->actionGeometry(&action1);
@@ -875,7 +875,7 @@ void tst_QToolBar::actionTriggered()
         QToolBarExtension *extension = extensions.at(0);
         if (extension->isVisible()) {
             QRect rect0 = extension->geometry();
-            QTest::mouseClick( extension, Qt::LeftButton, 0, rect0.center(), -1 );
+            QTest::mouseClick( extension, Qt::LeftButton, {}, rect0.center(), -1 );
             QApplication::processEvents();
             popupMenu = qobject_cast<QMenu *>(extension->menu());
             rect01 = popupMenu->actionGeometry(&action1);
@@ -916,28 +916,28 @@ void tst_QToolBar::actionTriggered()
     if (!rect01.isValid())
         QTest::mouseClick(button1, Qt::LeftButton);
     else
-        QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect01.center(), -1 );
+        QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect01.center(), -1 );
     QCOMPARE(::triggered, &action1);
 
     ::triggered = 0;
     if (!rect02.isValid())
         QTest::mouseClick(button2, Qt::LeftButton);
     else
-        QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect02.center(), -1 );
+        QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect02.center(), -1 );
     QCOMPARE(::triggered, &action2);
 
     ::triggered = 0;
     if (!rect03.isValid())
         QTest::mouseClick(button3, Qt::LeftButton);
     else
-        QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect03.center(), -1 );
+        QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect03.center(), -1 );
     QCOMPARE(::triggered, &action3);
 
     ::triggered = 0;
     if (!rect04.isValid())
         QTest::mouseClick(button4, Qt::LeftButton);
     else
-        QTest::mouseClick(popupMenu, Qt::LeftButton, 0, rect04.center(), -1 );
+        QTest::mouseClick(popupMenu, Qt::LeftButton, {}, rect04.center(), -1 );
     QCOMPARE(::triggered, &action4);
 }
 
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index 32a86993df..ed4df2fc23 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
@@ -215,14 +215,14 @@ void tst_QToolButton::task176137_autoRepeatOfAction()
 
     QSignalSpy spy(&action,SIGNAL(triggered()));
     QTest::mousePress (toolButton, Qt::LeftButton);
-    QTest::mouseRelease (toolButton, Qt::LeftButton, 0, QPoint (), 2000);
+    QTest::mouseRelease (toolButton, Qt::LeftButton, {}, QPoint (), 2000);
     QCOMPARE(spy.count(),1);
 
     // try again with auto repeat
     toolButton->setAutoRepeat (true);
     QSignalSpy repeatSpy(&action,SIGNAL(triggered())); // new spy
     QTest::mousePress (toolButton, Qt::LeftButton);
-    QTest::mouseRelease (toolButton, Qt::LeftButton, 0, QPoint (), 3000);
+    QTest::mouseRelease (toolButton, Qt::LeftButton, {}, QPoint (), 3000);
     const qreal expected = (3000 - toolButton->autoRepeatDelay()) / toolButton->autoRepeatInterval() + 1;
     //we check that the difference is small (on some systems timers are not super accurate)
     qreal diff = (expected - repeatSpy.count()) / expected;
@@ -242,7 +242,7 @@ void tst_QToolButton::sendMouseClick()
     }
     if (!m_menu->isVisible())
         return;
-    QTest::mouseClick(m_menu.data(), Qt::LeftButton, 0, QPoint(7, 7));
+    QTest::mouseClick(m_menu.data(), Qt::LeftButton, {}, QPoint(7, 7));
     if (QTimer *timer = qobject_cast<QTimer *>(sender())) {
         timer->stop();
         timer->deleteLater();