summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-03 12:02:58 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-03 12:02:58 (GMT)
commit0957c91931e53e2449ba8388c273519d9959ddb8 (patch)
tree5347cdb6280277b225bbffc9e575931878e4b156
parentb734af8e2e7e51f556bc768f8399f8c4b83e9cfc (diff)
Update KDescendantsProxyModel::setSourceModel to KF5 pre-5.25
Follow-up to 9cd881bdc7a0957ab59f08d9d562764cdd5fb979, as better fix
-rw-r--r--src/lib/marble/kdescendantsproxymodel.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/marble/kdescendantsproxymodel.cpp b/src/lib/marble/kdescendantsproxymodel.cpp
index 93a6d18..9b5239a 100644
--- a/src/lib/marble/kdescendantsproxymodel.cpp
+++ b/src/lib/marble/kdescendantsproxymodel.cpp
@@ -296,11 +296,7 @@ void KDescendantsProxyModel::setSourceModel(QAbstractItemModel *_sourceModel)
resetInternalData();
if (_sourceModel && _sourceModel->hasChildren()) {
- Q_ASSERT(_sourceModel->rowCount() > 0);
- d->m_pendingParents.append(QModelIndex());
- d->m_relayouting = true;
- d->scheduleProcessPendingParents();
- d->m_relayouting = false;
+ d->synchronousMappingRefresh();
}
endResetModel();