diff options
| author | Bill King <bking@trolltech.com> | 2010-02-10 02:34:50 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-10 02:34:50 (GMT) |
| commit | df27c6e5db83e41ace52e2cebca140a956e9e240 (patch) | |
| tree | c18beeadf18cb1f5dce7a69854631029e72a7fe1 /src/gui/itemviews/qlistview.cpp | |
| parent | 3318d412cb78a545790761161f243cb49da4abb7 (diff) | |
| parent | 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb (diff) | |
| download | Qt-df27c6e5db83e41ace52e2cebca140a956e9e240.zip Qt-df27c6e5db83e41ace52e2cebca140a956e9e240.tar.gz Qt-df27c6e5db83e41ace52e2cebca140a956e9e240.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'src/gui/itemviews/qlistview.cpp')
| -rw-r--r-- | src/gui/itemviews/qlistview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 19b1e8c..b2def39 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -2160,7 +2160,7 @@ void QListModeViewBase::scrollContentsBy(int dx, int dy, bool scrollElasticBand) } else { if (flowPositions.isEmpty()) return; - const int max = flowPositions.count() - 1; + const int max = scrollValueMap.count() - 1; if (vertical && flow() == QListView::TopToBottom && dy != 0) { int currentValue = qBound(0, verticalValue, max); int previousValue = qBound(0, currentValue + dy, max); |