diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-15 03:24:23 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-15 03:24:23 (GMT) |
| commit | edd486a8557b4c190581f81e782163e1f8ec9c73 (patch) | |
| tree | 53b3d4a48a70335f3524aca32c39950f780b6eb0 | |
| parent | 8ff26d85a4eb7ff937f9ecdcd3b71133d6478e15 (diff) | |
| parent | b55f19b956958dc94e8f35e7dc215a70445759a4 (diff) | |
| download | Qt-edd486a8557b4c190581f81e782163e1f8ec9c73.zip Qt-edd486a8557b4c190581f81e782163e1f8ec9c73.tar.gz Qt-edd486a8557b4c190581f81e782163e1f8ec9c73.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 9e6a67a..e5013a9 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -2061,7 +2061,7 @@ qreal QDeclarativeListView::maxYExtent() const return height(); if (d->maxExtentDirty) { if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) - d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd); + d->maxExtent = -(d->endPosition() - d->highlightRangeEnd); else d->maxExtent = -(d->endPosition() - height() + 1); if (d->footer) @@ -2098,7 +2098,7 @@ qreal QDeclarativeListView::maxXExtent() const return width(); if (d->maxExtentDirty) { if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange) - d->maxExtent = -(d->positionAt(count()-1) - d->highlightRangeEnd); + d->maxExtent = -(d->endPosition() - d->highlightRangeEnd); else d->maxExtent = -(d->endPosition() - width() + 1); if (d->footer) |