1 files changed, 89 insertions, 2 deletions

diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 8c93df9073..c5ccbc0d0b 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -115,6 +115,8 @@ private slots:
     void changeDataWithSorting();
     void changeDataWithStableSorting_data();
     void changeDataWithStableSorting();
+    void sizeHint_data();
+    void sizeHint();
 
     void sortedIndexOfChild_data();
     void sortedIndexOfChild();
@@ -161,6 +163,9 @@ private slots:
     void getMimeDataWithInvalidItem();
     void testVisualItemRect();
     void reparentHiddenItem();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void clearItemData();
+#endif
 
 public slots:
     void itemSelectionChanged();
@@ -2618,6 +2623,50 @@ void tst_QTreeWidget::changeDataWithStableSorting()
     QCOMPARE(layoutChangedSpy.count(), reorderingExpected ? 1 : 0);
 }
 
+void tst_QTreeWidget::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_QTreeWidget::sizeHint()
+{
+    QFETCH(int, scrollBarPolicy);
+    QFETCH(QSize, viewSize);
+
+    QTreeWidget view;
+    view.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
+    view.setVerticalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(scrollBarPolicy));
+    view.setHorizontalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(scrollBarPolicy));
+    view.setColumnCount(2);
+    for (int i = 0 ; i < view.columnCount(); ++i)
+        view.addTopLevelItem(new QTreeWidgetItem(QStringList{"foo","bar"}));
+
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+
+    if (viewSize.isValid()) {
+        view.resize(viewSize);
+        view.setColumnWidth(0, 100);
+        QTRY_COMPARE(view.size(), viewSize);
+    }
+
+    auto sizeHint = view.sizeHint();
+    view.hide();
+    QCOMPARE(view.sizeHint(), sizeHint);
+
+    view.header()->hide();
+    view.show();
+    sizeHint = view.sizeHint();
+    view.hide();
+    QCOMPARE(view.sizeHint(), sizeHint);
+}
+
 void tst_QTreeWidget::itemOperatorLessThan()
 {
     QTreeWidget tw;
@@ -3004,7 +3053,7 @@ void tst_QTreeWidget::task191552_rtl()
     opt.features = QStyleOptionViewItem::HasDisplay | QStyleOptionViewItem::HasCheckIndicator;
     opt.checkState = Qt::Checked;
     opt.widget = &tw;
-    const QRect checkRect = tw.style()->subElementRect(QStyle::SE_ViewItemCheckIndicator, &opt, &tw);
+    const QRect checkRect = tw.style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &opt, &tw);
     QTest::mouseClick(tw.viewport(), Qt::LeftButton, Qt::NoModifier, checkRect.center());
     QCOMPARE(item->checkState(0), Qt::Unchecked);
 
@@ -3218,7 +3267,7 @@ void tst_QTreeWidget::nonEditableTristate()
     option.checkState = item->checkState(0);
 
     const int checkMargin = qApp->style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, 0) + 1;
-    QPoint pos = qApp->style()->subElementRect(QStyle::SE_ViewItemCheckIndicator, &option, 0).center() + QPoint(checkMargin, 0);
+    QPoint pos = qApp->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &option, 0).center() + QPoint(checkMargin, 0);
     QTest::mouseClick(tree->viewport(), Qt::LeftButton, Qt::NoModifier, pos);
     QCOMPARE(int(item->checkState(0)), int(Qt::Checked));
 
@@ -3529,5 +3578,43 @@ void tst_QTreeWidget::reparentHiddenItem()
     QVERIFY(grandChild->isHidden());
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void tst_QTreeWidget::clearItemData()
+{
+    QTreeWidget tree;
+    QAbstractItemModel* model = tree.model();
+    QVERIFY(model->insertColumn(0));
+    QVERIFY(model->insertRow(0));
+    const QModelIndex parentIdx = model->index(0, 0);
+    QVERIFY(model->insertColumn(0, parentIdx));
+    QVERIFY(model->insertRow(0, parentIdx));
+    const QModelIndex childIdx = model->index(0, 0, parentIdx);
+    model->setData(parentIdx, QStringLiteral("parent"));
+    model->setData(parentIdx, QStringLiteral("parent"), Qt::UserRole);
+    model->setData(childIdx, QStringLiteral("child"));
+    QSignalSpy dataChangeSpy(model, &QAbstractItemModel::dataChanged);
+    QVERIFY(dataChangeSpy.isValid());
+    QVERIFY(!model->clearItemData(QModelIndex()));
+    QCOMPARE(dataChangeSpy.size(), 0);
+    QVERIFY(model->clearItemData(parentIdx));
+    QVERIFY(!model->data(parentIdx).isValid());
+    QVERIFY(!model->data(parentIdx, Qt::UserRole).isValid());
+    QCOMPARE(dataChangeSpy.size(), 1);
+    QList<QVariant> dataChangeArgs = dataChangeSpy.takeFirst();
+    QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), parentIdx);
+    QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), parentIdx);
+    QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty());
+    QVERIFY(model->clearItemData(parentIdx));
+    QCOMPARE(dataChangeSpy.size(), 0);
+    QVERIFY(model->clearItemData(childIdx));
+    QVERIFY(!model->data(childIdx).isValid());
+    QCOMPARE(dataChangeSpy.size(), 1);
+    dataChangeArgs = dataChangeSpy.takeFirst();
+    QCOMPARE(dataChangeArgs.at(0).value<QModelIndex>(), childIdx);
+    QCOMPARE(dataChangeArgs.at(1).value<QModelIndex>(), childIdx);
+    QVERIFY(dataChangeArgs.at(2).value<QVector<int>>().isEmpty());
+}
+#endif
+
 QTEST_MAIN(tst_QTreeWidget)
 #include "tst_qtreewidget.moc"