diff options
| author | Stephen Kelly <ske@ableton.com> | 2016-06-03 14:18:41 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-06-28 07:00:20 +0000 |
| commit | 3ffcfc357dbc51bf62ffb77eca9c99c6bf04e0f2 (patch) | |
| tree | 09749040c1ae50e2f00965686ed963b46d9b46b1 /src/corelib/itemmodels | |
| parent | 24961cb18c50efab4b62b91968f660d8b6736ec4 (diff) | |
QSFPM: Avoid following a reset with unnecessary layoutChanged
Follow the pattern used to guard Private::sort() calls elsewhere in the
class.
Because QAbstractItemModel::sort() is not called in the unit test, the
content is not sorted after resetting.
[ChangeLog][QtCore][QSortFilterProxyModel] QSortFilterProxyModel
now does not emit an unnecessary layoutChanged() following a model
reset.
Change-Id: I0a36c7fbb172bdd06ecddb489c5595debbef6cb9
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 539c190ac3..ef3281df30 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1408,7 +1408,7 @@ void QSortFilterProxyModelPrivate::_q_sourceReset() // All internal structures are deleted in clear() q->endResetModel(); update_source_sort_column(); - if (dynamic_sortfilter) + if (dynamic_sortfilter && update_source_sort_column()) sort(); } |