From 43ca477b0afa668f78f9543ef8883873466586b3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 29 Dec 2015 16:27:18 +0100 Subject: Fix QQuickItemViewPrivate::updateUnrequestedPositions() Don't attempt to reposition unrequested items at negative indexes, meaning that they are not in the model. The chances are that they have been already deleted. Change-Id: Iadd08518b11e0ea5d7965215a517aafaf35c95ba Task-number: QTBUG-48277 Reviewed-by: Nikita Krupenko Reviewed-by: Robin Burchell --- src/quick/items/qquickitemview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/quick') diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index e301e8f0f2..fbaec28c7c 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2452,8 +2452,10 @@ void QQuickItemViewPrivate::updateUnrequestedIndexes() void QQuickItemViewPrivate::updateUnrequestedPositions() { - for (QHash::const_iterator it = unrequestedItems.cbegin(), cend = unrequestedItems.cend(); it != cend; ++it) - repositionPackageItemAt(it.key(), it.value()); + for (QHash::const_iterator it = unrequestedItems.cbegin(), cend = unrequestedItems.cend(); it != cend; ++it) { + if (it.value() >= 0) + repositionPackageItemAt(it.key(), it.value()); + } } void QQuickItemViewPrivate::updateVisibleIndex() -- cgit v1.2.3