From 71660ee5652f1509ff9632a45e4aa1bc0040387d Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sat, 25 Feb 2012 11:07:52 +0100
Subject: Fix compilation without QT_DEPRECATED_SINCE

QAbstractItemModel::reset() is deprecated

Change-Id: I2d9aa9fade1660df14945ca11123341fce504050
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/corelib/itemmodels/qsortfilterproxymodel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/corelib/itemmodels')

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index ebd1ce2a70..b7ef69423f 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -883,9 +883,10 @@ void QSortFilterProxyModelPrivate::source_items_removed(
     if (proxy_count > source_to_proxy.size()) {
         // mapping is in an inconsistent state -- redo the whole mapping
         qWarning("QSortFilterProxyModel: inconsistent changes reported by source model");
-        remove_from_mapping(source_parent);
         Q_Q(QSortFilterProxyModel);
-        q->reset();
+        q->beginResetModel();
+        remove_from_mapping(source_parent);
+        q->endResetModel();
         return;
     }
 
-- 
cgit v1.2.3