diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:26:46 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:30:04 (GMT) |
| commit | b504a21a7d62b24ac5f16cb3f1a88479da1499d5 (patch) | |
| tree | 1b5236c294246874a2fde0157b06dfd23feb00e9 /src/gui/itemviews/qlistview.cpp | |
| parent | a522568283195cd4b851b190d249d33e25489642 (diff) | |
| parent | d35fe5bb21008ab30c76ebd2fe688ea3e35c084e (diff) | |
| download | Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.zip Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.tar.gz Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/itemviews/qlistview.cpp
Diffstat (limited to 'src/gui/itemviews/qlistview.cpp')
| -rw-r--r-- | src/gui/itemviews/qlistview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index fc801ad..5b5cfa1 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -1804,12 +1804,12 @@ QItemSelection QListViewPrivate::selection(const QRect &rect) const void QCommonListViewBase::appendHiddenRow(int row) { - dd->hiddenRows.append(dd->model->index(row, 0)); + dd->hiddenRows.append(dd->model->index(row, 0, qq->rootIndex())); } void QCommonListViewBase::removeHiddenRow(int row) { - dd->hiddenRows.remove(dd->hiddenRows.indexOf(dd->model->index(row, 0))); + dd->hiddenRows.remove(dd->hiddenRows.indexOf(dd->model->index(row, 0, qq->rootIndex()))); } void QCommonListViewBase::updateHorizontalScrollBar(const QSize &step) |