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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

2 files changed, 3 insertions, 1 deletions

diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
index 9648cef3de..ff870915be 100644
--- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
@@ -1,3 +1,5 @@
 [moveCursorBiggerJump]
 osx
+[mouseWheel:scroll down per pixel]
+macos
 
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();