1 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index 7f92d2a81b..d1982d4777 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -90,6 +90,7 @@ public:
           minimumSectionSize(-1),
           maximumSectionSize(-1),
           lastSectionSize(0),
+          lastSectionLogicalIdx(-1), // Only trust when we stretch last section
           sectionIndicatorOffset(0),
           sectionIndicator(0),
           globalResizeMode(QHeaderView::Interactive),
@@ -99,6 +100,9 @@ public:
 
 
     int lastVisibleVisualIndex() const;
+    void restoreSizeOnPrevLastSection();
+    void setNewLastSection(int visualIndexForLastSection);
+    void maybeRestorePrevLastSectionAndStretchLast();
     int sectionHandleAt(int position);
     void setupSectionIndicator(int section, int position);
     void updateSectionIndicator(int section, int position);
@@ -281,7 +285,8 @@ public:
     int defaultSectionSize;
     int minimumSectionSize;
     int maximumSectionSize;
-    int lastSectionSize; // $$$
+    int lastSectionSize;
+    int lastSectionLogicalIdx; // Only trust if we stretch LastSection
     int sectionIndicatorOffset;
     Qt::Alignment defaultAlignment;
     QLabel *sectionIndicator;
@@ -327,8 +332,8 @@ public:
 
     inline int headerLength() const { // for debugging
         int len = 0;
-        for (int i = 0; i < sectionItems.count(); ++i)
-            len += sectionItems.at(i).size;
+        for (const auto &section : sectionItems)
+            len += section.size;
         return len;
     }