Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

2 files changed, 37 insertions, 7 deletions

diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
index fc231a4e30..be90475a6f 100644
--- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST
@@ -1,2 +1,4 @@
 [moveCursorBiggerJump]
 osx
+[columnViewportPosition]
+winrt # QTBUG-72853
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 228d03350a..b1ddc6e7a2 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -1264,19 +1264,47 @@ void tst_QTableView::moveCursorStrikesBack_data()
     for (int i = 0; i < 7; ++i)
         fullList << i;
 
-    QTest::newRow("All disabled, wrap forward. Timeout => FAIL") << -1 << -1
+    QTest::newRow("All disabled, wrap forward. => invalid index") << -1 << -1
             << fullList
             << fullList
             << QRect()
             << 1 << 0 << (IntList() << int(QtTestTableView::MoveNext))
-            << 1 << 0;
+            << -1 << -1;
 
-    QTest::newRow("All disabled, wrap backwards. Timeout => FAIL") << -1 << -1
+    QTest::newRow("All disabled, wrap backwards. => invalid index") << -1 << -1
             << fullList
             << fullList
             << QRect()
             << 1 << 0 << (IntList() << int(QtTestTableView::MovePrevious))
+            << -1 << -1;
+
+    QTest::newRow("Last column disabled, MoveEnd. QTBUG-72400") << -1 << -1
+            << IntList()
+            << (IntList() << 6)
+            << QRect()
+            << 0 << 0 << (IntList() << int(QtTestTableView::MoveEnd))
+            << 0 << 5;
+
+    QTest::newRow("First column disabled, MoveHome. QTBUG-72400") << -1 << -1
+            << IntList()
+            << (IntList() << 0)
+            << QRect()
+            << 0 << 6 << (IntList() << int(QtTestTableView::MoveHome))
+            << 0 << 1;
+
+    QTest::newRow("First row disabled, MovePageUp. QTBUG-72400") << -1 << -1
+            << (IntList() << 0)
+            << IntList()
+            << QRect()
+            << 2 << 0 << (IntList() << int(QtTestTableView::MovePageUp))
             << 1 << 0;
+
+    QTest::newRow("Last row disabled, MovePageDown. QTBUG-72400") << -1 << -1
+            << (IntList() << 6)
+            << IntList()
+            << QRect()
+            << 4 << 0 << (IntList() << int(QtTestTableView::MovePageDown))
+            << 5 << 0;
 }
 
 void tst_QTableView::moveCursorStrikesBack()
@@ -1302,6 +1330,9 @@ void tst_QTableView::moveCursorStrikesBack()
     if (span.height() && span.width())
         view.setSpan(span.top(), span.left(), span.height(), span.width());
     view.show();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+    // resize to make sure there are scrollbars
+    view.resize(view.columnWidth(0) * 7, view.rowHeight(0) * 7);
 
     QModelIndex index = model.index(startRow, startColumn);
     view.setCurrentIndex(index);
@@ -1320,9 +1351,6 @@ void tst_QTableView::moveCursorStrikesBack()
         newColumn = newIndex.column();
     }
 
-    // expected fails, task 119433
-    if(newRow == -1)
-        return;
     QCOMPARE(newRow, expectedRow);
     QCOMPARE(newColumn, expectedColumn);
 }
@@ -4225,7 +4253,7 @@ void tst_QTableView::task234926_setHeaderSorting()
     QStringList sortedDataA = data;
     QStringList sortedDataD = data;
     std::sort(sortedDataA.begin(), sortedDataA.end());
-    std::sort(sortedDataD.begin(), sortedDataD.end(), qGreater<QString>());
+    std::sort(sortedDataD.begin(), sortedDataD.end(), std::greater<QString>());
     model.setStringList(data);
     QTableView view;
     view.setModel(&model);