Merge dev into 5.12

Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 9399ebce34..f6ed3e142d 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -98,6 +98,7 @@ private slots:
     void checkChildren();
     void data();
     void clear();
+    void clearItemData();
     void sort_data();
     void sort();
     void sortRole_data();
@@ -752,6 +753,27 @@ void tst_QStandardItemModel::data()
 
 }
 
+void tst_QStandardItemModel::clearItemData()
+{
+    currentRoles.clear();
+    QVERIFY(!m_model->clearItemData(QModelIndex()));
+    QCOMPARE(currentRoles, {});
+    const QModelIndex idx = m_model->index(0, 0);
+    const QMap<int, QVariant> oldData = m_model->itemData(idx);
+    m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole);
+    m_model->setData(idx, QLatin1String("tooltip"), Qt::ToolTipRole);
+    m_model->setData(idx, 5, Qt::UserRole);
+    currentRoles.clear();
+    QVERIFY(m_model->clearItemData(idx));
+    QCOMPARE(idx.data(Qt::UserRole), QVariant());
+    QCOMPARE(idx.data(Qt::ToolTipRole), QVariant());
+    QCOMPARE(idx.data(Qt::DisplayRole), QVariant());
+    QCOMPARE(idx.data(Qt::EditRole), QVariant());
+    QCOMPARE(currentRoles, {});
+    m_model->setItemData(idx, oldData);
+    currentRoles.clear();
+}
+
 void tst_QStandardItemModel::clear()
 {
     QStandardItemModel model;