diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:48 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:48 +0200 |
commit | f21330b7497db846deb0c16a8e70ac1fecb522ba (patch) | |
tree | 1a493eedb9c382462079d9c144970343f2dc6296 /src/gui/itemmodels/qstandarditemmodel.cpp | |
parent | e8dacba47a59944e4a5ca271c4698e5dfbdbe9d5 (diff) | |
parent | 35ebdeb83eb4057f5e50042747b13d0772051459 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I799e2ca2fefa140c8b73b73aa959c6ed8da6eae6
Diffstat (limited to 'src/gui/itemmodels/qstandarditemmodel.cpp')
-rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 2288c26524..aa640f4d7e 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; } @@ -2939,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(); } /*! |