1 files changed, 81 insertions, 3 deletions

diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 4155ff1ec6..2e8f262c85 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -83,12 +83,17 @@ private slots:
     void setItemData();
     void cellWidget();
     void cellWidgetGeometry();
+    void sizeHint_data();
+    void sizeHint();
     void task231094();
     void task219380_removeLastRow();
     void task262056_sortDuplicate();
     void itemWithHeaderItems();
     void mimeData();
     void selectedRowAfterSorting();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void clearItemData();
+#endif
 
 private:
     QTableWidget *testWidget;
@@ -191,10 +196,10 @@ void tst_QTableWidget::clear()
 {
     QTableWidgetItem *item = new QTableWidgetItem("foo");
     testWidget->setItem(0, 0, item);
-    testWidget->setItemSelected(item, true);
+    item->setSelected(true);
 
     QVERIFY(testWidget->item(0, 0) == item);
-    QVERIFY(testWidget->isItemSelected(item));
+    QVERIFY(item->isSelected());
 
 
     QPointer<QObjectTableItem> bla = new QObjectTableItem();
@@ -578,7 +583,7 @@ void tst_QTableWidget::selectedItems()
                 continue;
 
             QTableWidgetItem *item = testWidget->item(row, column);
-            if (item && testWidget->isItemSelected(item))
+            if (item && item->isSelected())
                 QVERIFY(selectedItems.contains(item));
         }
     }
@@ -1454,6 +1459,56 @@ void tst_QTableWidget::cellWidgetGeometry()
     QCOMPARE(tw.visualItemRect(item).top(), le->geometry().top());
 }
 
+void tst_QTableWidget::sizeHint_data()
+{
+    QTest::addColumn<int>("scrollBarPolicy");
+    QTest::addColumn<QSize>("viewSize");
+    QTest::newRow("ScrollBarAlwaysOn") << static_cast<int>(Qt::ScrollBarAlwaysOn) << QSize();
+    QTest::newRow("ScrollBarAlwaysOff") << static_cast<int>(Qt::ScrollBarAlwaysOff) << QSize();
+    // make sure the scrollbars are shown by resizing the view to 40x40
+    QTest::newRow("ScrollBarAsNeeded (40x40)") << static_cast<int>(Qt::ScrollBarAsNeeded) << QSize(40, 40);
+    QTest::newRow("ScrollBarAsNeeded (1000x1000)") << static_cast<int>(Qt::ScrollBarAsNeeded) << QSize(1000, 1000);
+}
+
+void tst_QTableWidget::sizeHint()
+{
+    QFETCH(int, scrollBarPolicy);
+    QFETCH(QSize, viewSize);
+
+    QTableWidget view(2, 2);
+    view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    view.setVerticalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(scrollBarPolicy));
+    view.setHorizontalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(scrollBarPolicy));
+    for (int r = 0 ; r < view.rowCount(); ++r)
+        for (int c = 0 ; c < view.columnCount(); ++c)
+            view.setItem(r, c, new QTableWidgetItem(QString("%1/%2").arg(r).arg(c)));
+
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    if (viewSize.isValid()) {
+        view.resize(viewSize);
+        view.setColumnWidth(0, 100);
+        view.setRowHeight(0, 100);
+        QTRY_COMPARE(view.size(), viewSize);
+    }
+
+    auto sizeHint = view.sizeHint();
+    view.hide();
+    QCOMPARE(view.sizeHint(), sizeHint);
+
+    view.horizontalHeader()->hide();
+    view.show();
+    sizeHint = view.sizeHint();
+    view.hide();
+    QCOMPARE(view.sizeHint(), sizeHint);
+
+    view.verticalHeader()->hide();
+    view.show();
+    sizeHint = view.sizeHint();
+    view.hide();
+    QCOMPARE(view.sizeHint(), sizeHint);
+}
+
 void tst_QTableWidget::task231094()
 {
     QTableWidget tw(5, 3);
@@ -1617,5 +1672,28 @@ void tst_QTableWidget::selectedRowAfterSorting()
     }
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void tst_QTableWidget::clearItemData()
+{
+    QTableWidget table(3,3);
+    for (int r = 0; r < 3; r++)
+        for (int c = 0; c < 3; c++)
+            table.setItem(r,c,new QTableWidgetItem(QStringLiteral("0")));
+    QSignalSpy dataChangeSpy(table.model(), &QAbstractItemModel::dataChanged);
+    QVERIFY(dataChangeSpy.isValid());
+    QVERIFY(!table.model()->clearItemData(QModelIndex()));
+    QCOMPARE(dataChangeSpy.size(), 0);
+    QVERIFY(table.model()->clearItemData(table.model()->index(0, 0)));
+    QVERIFY(!table.model()->index(0, 0).data().isValid());
+    QCOMPARE(dataChangeSpy.size(), 1);
+    const QList<QVariant> dataChangeArgs = dataChangeSpy.takeFirst();
+    QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), table.model()->index(0, 0));
+    QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), table.model()->index(0, 0));
+    QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty());
+    QVERIFY(table.model()->clearItemData(table.model()->index(0, 0)));
+    QCOMPARE(dataChangeSpy.size(), 0);
+}
+#endif
+
 QTEST_MAIN(tst_QTableWidget)
 #include "tst_qtablewidget.moc"