1 files changed, 59 insertions, 0 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 09990ab70a..1d0153213b 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -331,8 +331,10 @@ private slots:
     void selectColumn_data();
     void selectColumn();
 
+#if QT_CONFIG(shortcut)
     void selectall_data();
     void selectall();
+#endif
 
     void visualRect_data();
     void visualRect();
@@ -418,6 +420,7 @@ private slots:
     void taskQTBUG_10169_sizeHintForRow();
     void taskQTBUG_30653_doItemsLayout();
     void taskQTBUG_50171_selectRowAfterSwapColumns();
+    void deselectRow();
 
 #if QT_CONFIG(wheelevent)
     void mouseWheel_data();
@@ -585,6 +588,9 @@ void tst_QTableView::keyboardNavigation_data()
 
 void tst_QTableView::keyboardNavigation()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(int, rowCount);
     QFETCH(int, columnCount);
     QFETCH(bool, tabKeyNavigation);
@@ -1254,6 +1260,9 @@ void tst_QTableView::moveCursorStrikesBack_data()
 
 void tst_QTableView::moveCursorStrikesBack()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(int, hideRow);
     QFETCH(int, hideColumn);
     QFETCH(const IntList, disableRows);
@@ -1836,6 +1845,8 @@ void tst_QTableView::selectColumn()
         QCOMPARE(view.selectionModel()->selectedIndexes().at(i).column(), column);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QTableView::selectall_data()
 {
     QTest::addColumn<int>("rowCount");
@@ -1992,6 +2003,8 @@ void tst_QTableView::selectall()
     QCOMPARE(view.selectedIndexes().count(), 0);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QTableView::visualRect_data()
 {
     QTest::addColumn<int>("rowCount");
@@ -3240,6 +3253,9 @@ void tst_QTableView::spans()
 
 void tst_QTableView::spansAfterRowInsertion()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QtTestTableModel model(10, 10);
     QtTestTableView view;
     view.setModel(&model);
@@ -3276,6 +3292,9 @@ void tst_QTableView::spansAfterRowInsertion()
 
 void tst_QTableView::spansAfterColumnInsertion()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QtTestTableModel model(10, 10);
     QtTestTableView view;
     view.setModel(&model);
@@ -3312,6 +3331,9 @@ void tst_QTableView::spansAfterColumnInsertion()
 
 void tst_QTableView::spansAfterRowRemoval()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QtTestTableModel model(10, 10);
     QtTestTableView view;
     view.setModel(&model);
@@ -3353,6 +3375,9 @@ void tst_QTableView::spansAfterRowRemoval()
 
 void tst_QTableView::spansAfterColumnRemoval()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QtTestTableModel model(10, 10);
     QtTestTableView view;
     view.setModel(&model);
@@ -3509,6 +3534,9 @@ public:
 
 void tst_QTableView::editSpanFromDirections()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(const KeyList, keyPresses);
     QFETCH(QSharedPointer<QStandardItemModel>, model);
     QFETCH(int, row);
@@ -3644,6 +3672,9 @@ QT_END_NAMESPACE
 
 void tst_QTableView::tabFocus()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     if (!qt_tab_all_widgets())
         QSKIP("This test requires full keyboard control to be enabled.");
 
@@ -4069,6 +4100,9 @@ struct ValueSaver {
 
 void tst_QTableView::task191545_dragSelectRows()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QStandardItemModel model(10, 10);
     QTableView table;
     table.setModel(&model);
@@ -4492,6 +4526,31 @@ void tst_QTableView::taskQTBUG_50171_selectRowAfterSwapColumns()
     }
 }
 
+class DeselectTableWidget : public QTableWidget
+{
+public:
+    using QTableWidget::QTableWidget;
+    QItemSelectionModel::SelectionFlags selectionCommand(const QModelIndex &,
+                                                         const QEvent * = nullptr) const override
+    {
+        return QItemSelectionModel::Toggle;
+    }
+};
+
+void tst_QTableView::deselectRow()
+{
+    DeselectTableWidget tw(20, 20);
+    tw.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&tw));
+    tw.hideColumn(0);
+    QVERIFY(tw.isColumnHidden(0));
+    tw.selectRow(1);
+    QVERIFY(tw.selectionModel()->isRowSelected(1, QModelIndex()));
+    tw.selectRow(1);
+    // QTBUG-79092 - deselection was not possible when column 0 was hidden
+    QVERIFY(!tw.selectionModel()->isRowSelected(1, QModelIndex()));
+}
+
 // This has nothing to do with QTableView, but it's convenient to reuse the QtTestTableModel
 #if QT_CONFIG(textmarkdownwriter)