diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-29 16:27:18 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-02 17:22:07 +0000 |
commit | 43ca477b0afa668f78f9543ef8883873466586b3 (patch) | |
tree | d18dca00b13fdf29800d7587c0be9c8fd8778f09 /src | |
parent | 6d8f6a7e406515df358bacc6f737f4fe5fae97ea (diff) |
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 <krnekit@gmail.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickitemview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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<QQuickItem*,int>::const_iterator it = unrequestedItems.cbegin(), cend = unrequestedItems.cend(); it != cend; ++it) - repositionPackageItemAt(it.key(), it.value()); + for (QHash<QQuickItem*,int>::const_iterator it = unrequestedItems.cbegin(), cend = unrequestedItems.cend(); it != cend; ++it) { + if (it.value() >= 0) + repositionPackageItemAt(it.key(), it.value()); + } } void QQuickItemViewPrivate::updateVisibleIndex() |