summaryrefslogtreecommitdiffstats
path: root/tests/auto/modeltest/dynamictreemodel.cpp
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2010-01-06 10:48:25 +0100
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-06 10:48:25 +0100
commitd149a3faca9b97ce806249bc7ef73fe2f59589d5 (patch)
tree65a4f6006c240b5e048daf235043cfcff61734f3 /tests/auto/modeltest/dynamictreemodel.cpp
parentdbc4a07327e0c306eb84a65ae7fa98bdb36c6ad0 (diff)
Don't call invalidate when resetting the QSortFilterProxyModel.
The invalidate connection is made before connecting the source model, which means it gets called first. If a second proxy model is used with it, the sourceLayoutAboutToBeChanged of the second proxy is therefore called before its sourceReset slot, but after the persistent indexes of the first model have been invalidated. The invalidate call is not needed because clear_mappings is called when the source model is reset anyway. Merge-request: 416 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Diffstat (limited to 'tests/auto/modeltest/dynamictreemodel.cpp')
-rw-r--r--tests/auto/modeltest/dynamictreemodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp
index 24d3ab3ce6..b572eb16a1 100644
--- a/tests/auto/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/modeltest/dynamictreemodel.cpp
@@ -160,10 +160,11 @@ QVariant DynamicTreeModel::data(const QModelIndex &index, int role) const
void DynamicTreeModel::clear()
{
+ beginResetModel();
m_items.clear();
m_childItems.clear();
nextId = 1;
- reset();
+ endResetModel();
}