From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 16 Mar 2012 04:48:58 +0000 (+1000)
Subject: Don't crash view while changing model.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=cbe346a906f025af932b67c7c9672b109e218fa0;p=konrad%2Fqtdeclarative.git

Don't crash view while changing model.

Set model to null before adjusting view position, as changing
position can trigger a refill() if the view is animating at
that instance.

Change-Id: I4bc20766b1ab906799213b149c84a1bdb268c200
Reviewed-by: Bea Lam <bea.lam@nokia.com>
---

diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 501b206..5089d23 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -257,8 +257,8 @@ void QQuickItemView::setModel(const QVariant &model)
     QQuickVisualModel *oldModel = d->model;
 
     d->clear();
-    d->setPosition(d->contentStartOffset());
     d->model = 0;
+    d->setPosition(d->contentStartOffset());
     d->modelVariant = model;
 
     QObject *object = qvariant_cast<QObject*>(model);