From 66d56ad79f6294091a0d8691380edded6844bfc1 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 3 Oct 2011 11:03:39 +1000
Subject: [PATCH] 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>
---
 src/declarative/items/qsgitemview.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/declarative/items/qsgitemview.cpp b/src/declarative/items/qsgitemview.cpp
index 1791fb9..7e77a0a 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());
-- 
1.7.2.5