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>

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