projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6cb5901
)
Don't crash view while changing model.
author
Martin Jones
<martin.jones@nokia.com>
Fri, 16 Mar 2012 04:48:58 +0000
(14:48 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 19 Mar 2012 09:48:50 +0000
(10:48 +0100)
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>
src/quick/items/qquickitemview.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquickitemview.cpp
b/src/quick/items/qquickitemview.cpp
index
501b206
..
5089d23
100644
(file)
--- 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);