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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 4 insertions, 4 deletions

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);