1 files changed, 43 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..4a6244826e 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -161,6 +161,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();
@@ -3004,7 +3007,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 +3221,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 +3532,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"