AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation without QT_DEPRECATED_SINCE

Browse Source 
QAbstractItemModel::reset() is deprecated

Change-Id: I2d9aa9fade1660df14945ca11123341fce504050
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Olivier Goffart 2012-02-25 11:07:52 +01:00 committed by Qt by Nokia
parent e430ddfafc
commit 71660ee565
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -883,9 +883,10 @@ void QSortFilterProxyModelPrivate::source_items_removed(
if (proxy_count > source_to_proxy.size()) { if (proxy_count > source_to_proxy.size()) {
// mapping is in an inconsistent state -- redo the whole mapping // mapping is in an inconsistent state -- redo the whole mapping
qWarning("QSortFilterProxyModel: inconsistent changes reported by source model"); qWarning("QSortFilterProxyModel: inconsistent changes reported by source model");
remove_from_mapping(source_parent);
Q_Q(QSortFilterProxyModel); Q_Q(QSortFilterProxyModel);
q->reset(); q->beginResetModel();
remove_from_mapping(source_parent);
q->endResetModel();
return; return;
} }