diff options
| author |   Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer |   Liang Qi <liang.qi@qt.io> | 2020-01-28 14:17:01 +0000 |
| commit | ef442327b8a4122fe46462e95a0537ec5ac53cb6 (patch) | |
| tree | c0a0267ab4175d520a27c1dc7b589af220e77c48 /src/gui/itemmodels/qstandarditemmodel.cpp | |
| parent | QProcess: remove deprecated signature of finished signal (diff) | |
| parent | Merge remote-tracking branch 'origin/5.15' into dev (diff) | |
| download | qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.tar.xz qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.zip | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/gui/itemmodels/qstandarditemmodel.cpp')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 9bdc22b49e..fc9424763e 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -926,7 +926,7 @@ void QStandardItem::setData(const QVariant &value, int role) for (it = d->values.begin(); it != d->values.end(); ++it) { if ((*it).role == role) { if (value.isValid()) { - if ((*it).value.type() == value.type() && (*it).value == value) + if ((*it).value.userType() == value.userType() && (*it).value == value) return; (*it).value = value; } else { |