diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 03:28:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 03:28:10 (GMT) |
| commit | a41019035a0bed4e825d35bd3340c40524cec378 (patch) | |
| tree | 69d9d4c11656fb01c3b2f32c95199b03ec12ac86 /src | |
| parent | 2458cb45665b0fe3144266122f876bd541de9c42 (diff) | |
| parent | 7142fbe52cfca2887cb8ee083d4d91c35ef249f8 (diff) | |
| download | Qt-a41019035a0bed4e825d35bd3340c40524cec378.zip Qt-a41019035a0bed4e825d35bd3340c40524cec378.tar.gz Qt-a41019035a0bed4e825d35bd3340c40524cec378.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QTableView: fix navigating with keyboard with spans not scrolling
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/itemviews/qtableview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp index cf1b542..c824a8a 100644 --- a/src/gui/itemviews/qtableview.cpp +++ b/src/gui/itemviews/qtableview.cpp @@ -2554,7 +2554,7 @@ void QTableView::scrollTo(const QModelIndex &index, ScrollHint hint) // check if we really need to do anything if (!d->isIndexValid(index) || (d->model->parent(index) != d->root) - || isIndexHidden(index)) + || isRowHidden(index.row()) || isColumnHidden(index.column())) return; QSpanCollection::Span span; |