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

Change-Id: I5bdfe94f7eec1ba328c4a4b54d12dbc0da7fc3ac

2 files changed, 2 insertions, 2 deletions

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