diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-04-05 14:43:20 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-04-05 14:43:20 (GMT) |
| commit | a343e8674947415f8ef3319c62a88f72458f25ad (patch) | |
| tree | 54cf25c81f94911bf66b1f9f564970e91df3fdbe /src/declarative | |
| parent | 87a28f7ab7b1b94072e75740d690192bbdcfdaa5 (diff) | |
| parent | a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84 (diff) | |
| download | Qt-a343e8674947415f8ef3319c62a88f72458f25ad.zip Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.gz Qt-a343e8674947415f8ef3319c62a88f72458f25ad.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 546f75e..b890c4f 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -197,6 +197,7 @@ public: if (q->isComponentComplete()) { clear(); updateGrid(); + setPosition(0); q->refill(); updateCurrent(currentIndex); } @@ -689,7 +690,6 @@ void QDeclarativeGridViewPrivate::updateGrid() q->setContentHeight(endPosition() - startPosition()); else q->setContentWidth(lastPosition() - originPosition()); - setPosition(0); } } |