Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c

1 files changed, 8 insertions, 3 deletions

diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 37c52948b0..471f8b149c 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -1126,10 +1126,15 @@ void QTableView::doItemsLayout()
 {
     Q_D(QTableView);
     QAbstractItemView::doItemsLayout();
-    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem)
-        d->verticalHeader->setOffsetToSectionPosition(verticalScrollBar()->value());
-    else
+    if (verticalScrollMode() == QAbstractItemView::ScrollPerItem) {
+        const int max = verticalScrollBar()->maximum();
+        if (max > 0 && verticalScrollBar()->value() == max)
+            d->verticalHeader->setOffsetToLastSection();
+        else
+            d->verticalHeader->setOffsetToSectionPosition(verticalScrollBar()->value());
+    } else {
         d->verticalHeader->setOffset(verticalScrollBar()->value());
+    }
     if (!d->verticalHeader->updatesEnabled())
         d->verticalHeader->setUpdatesEnabled(true);
 }