QTreeView automatic resize can be broken

QTreeView sometimes autoresizes the wrong column

Task-number: 210390
Reviewed-by: janarve

1 files changed, 3 insertions, 6 deletions

diff --git a/src/gui/itemviews/qheaderview_p.h b/src/gui/itemviews/qheaderview_p.h
index fbba69a..95bd84c 100644
--- a/src/gui/itemviews/qheaderview_p.h
+++ b/src/gui/itemviews/qheaderview_p.h
@@ -91,6 +91,7 @@ public:
           stretchLastSection(false),
           cascadingResizing(false),
           forceInitializing(false),
+          resizeRecursionBlock(false),
           stretchSections(0),
           contentsSections(0),
           minimumSectionSize(-1),
@@ -170,10 +171,6 @@ public:
         if (!sectionHidden.isEmpty()) sectionHidden.setBit(visual, hidden);
     }
 
-    inline QHeaderView::ResizeMode visualIndexResizeMode(int visual) const {
-        return headerSectionResizeMode(visual);
-    }
-
     inline bool hasAutoResizeSections() const {
         return stretchSections || stretchLastSection || contentsSections;
     }
@@ -211,7 +208,7 @@ public:
     }
 
     inline bool sectionIsCascadable(int visual) const {
-        return visualIndexResizeMode(visual) == QHeaderView::Interactive;
+        return headerSectionResizeMode(visual) == QHeaderView::Interactive;
     }
 
     inline int modelSectionCount() const {
@@ -231,7 +228,6 @@ public:
 
     inline void executePostedResize() const {
         if (delayedResize.isActive() && state == NoState) {
-            delayedResize.stop();
             const_cast<QHeaderView*>(q_func())->resizeSections();
         }
     }
@@ -276,6 +272,7 @@ public:
     bool stretchLastSection;
     bool cascadingResizing;
     bool forceInitializing;
+    bool resizeRecursionBlock;
     int stretchSections;
     int contentsSections;
     int defaultSectionSize;