aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2011-10-03 11:03:39 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-03 09:04:28 +0200
commit66d56ad79f6294091a0d8691380edded6844bfc1 (patch)
tree50f3c4cf3bc80604a59755994d55a44fa1f0b11d /src
parentbd2eece4a68808c771d39cd53922ef538d0ba54d (diff)
Don't layout while applying model changes
Task-number: QTBUG-21742 Change-Id: I0e01b9ac9f033108410ccd431329dd7d50edb8f2 Reviewed-on: http://codereview.qt-project.org/5903 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qsgitemview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/items/qsgitemview.cpp b/src/declarative/items/qsgitemview.cpp
index 1791fb9dae..7e77a0a601 100644
--- a/src/declarative/items/qsgitemview.cpp
+++ b/src/declarative/items/qsgitemview.cpp
@@ -1381,6 +1381,9 @@ void QSGItemViewPrivate::updateViewport()
void QSGItemViewPrivate::layout()
{
Q_Q(QSGItemView);
+ if (inApplyModelChanges)
+ return;
+
if (!isValid() && !visibleItems.count()) {
clear();
setPosition(contentStartPosition());