summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativegridview.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-27 01:57:08 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-27 01:57:08 (GMT)
commit95fa13fe7cd28629567edf8d7cf6adbeb9b111aa (patch)
tree519356eab4bb48f8caf91fa52479ba90fe7959f2 /src/declarative/graphicsitems/qdeclarativegridview.cpp
parent46cf45c5c9dc74bf2cbe42c8a57be194ea9cf8cd (diff)
downloadQt-95fa13fe7cd28629567edf8d7cf6adbeb9b111aa.zip
Qt-95fa13fe7cd28629567edf8d7cf6adbeb9b111aa.tar.gz
Qt-95fa13fe7cd28629567edf8d7cf6adbeb9b111aa.tar.bz2
Don't "adjust" the z value of a delegate that has been cached.
Task-number: QTBUG-10131
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index f8b773e..f79a853 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -375,9 +375,11 @@ FxGridItem *QDeclarativeGridViewPrivate::createItem(int modelIndex)
if (QDeclarativeItem *item = model->item(modelIndex, false)) {
listItem = new FxGridItem(item, q);
listItem->index = modelIndex;
- listItem->item->setZValue(1);
- // complete
- model->completeItem();
+ if (model->completePending()) {
+ // complete
+ listItem->item->setZValue(1);
+ model->completeItem();
+ }
listItem->item->setParentItem(q->viewport());
unrequestedItems.remove(listItem->item);
}