1 files changed, 41 insertions, 4 deletions

diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 235bc5bd7d..8ec88ebc60 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -306,8 +306,11 @@ const QMap<int, QVariant> QStandardItemPrivate::itemData() const
 {
     QMap<int, QVariant> result;
     QVector<QStandardItemData>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it)
-        result.insert((*it).role, (*it).value);
+    for (it = values.cbegin(); it != values.cend(); ++it){
+        // Qt::UserRole - 1 is used internally to store the flags
+        if (it->role != Qt::UserRole - 1)
+            result.insert(it->role, it->value);
+    }
     return result;
 }
 
@@ -931,6 +934,21 @@ void QStandardItem::setData(const QVariant &value, int role)
 }
 
 /*!
+    \since 5.12
+    Removes all the data from all roles previously set.
+    \sa data(), setData()
+*/
+void QStandardItem::clearData()
+{
+    Q_D(QStandardItem);
+    if (d->values.isEmpty())
+        return;
+    d->values.clear();
+    if (d->model)
+        d->model->d_func()->itemChanged(this, QVector<int>{});
+}
+
+/*!
     Returns the item's data for the given \a role, or an invalid
     QVariant if there is no data for the role.
 
@@ -2924,8 +2942,10 @@ bool QStandardItemModel::insertRows(int row, int count, const QModelIndex &paren
 QMap<int, QVariant> QStandardItemModel::itemData(const QModelIndex &index) const
 {
     Q_D(const QStandardItemModel);
-    QStandardItem *item = d->itemFromIndex(index);
-    return item ? item->d_func()->itemData() : QMap<int, QVariant>();
+    const QStandardItem *const item = d->itemFromIndex(index);
+    if (!item || item == d->root.data())
+        return QMap<int, QVariant>();
+    return item->d_func()->itemData();
 }
 
 /*!
@@ -2991,6 +3011,23 @@ bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value
 }
 
 /*!
+  \since 5.12
+  Removes the data stored in all the roles for the given \a index.
+  \sa setData(), data()
+*/
+bool QStandardItemModel::clearItemData(const QModelIndex &index)
+{
+    if (!checkIndex(index, CheckIndexOption::IndexIsValid))
+        return false;
+    Q_D(QStandardItemModel);
+    QStandardItem *item = d->itemFromIndex(index);
+    if (!item)
+        return false;
+    item->clearData();
+    return true;
+}
+
+/*!
   \reimp
 */
 bool QStandardItemModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role)