From dd24ba2bc9c6c25fe2e7ba3f308253ae7dfc4cb7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Mon, 12 Oct 2009 09:44:51 +0200
Subject: Revert merge commit 3945fd75a93d790434b33c2d23a

The resolution of conflicts introduced regressions. And the commit
was already in 4.6
---
 src/gui/itemviews/qheaderview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index 0045bd5..fc9820f 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -524,8 +524,8 @@ QSize QHeaderView::sizeHint() const
     Q_D(const QHeaderView);
     if (d->cachedSizeHint.isValid())
         return d->cachedSizeHint;
+    d->cachedSizeHint = QSize(0, 0); //reinitialize the cached size hint
     const int sectionCount = count();
-    d->executePostedLayout();
 
     // get size hint for the first n sections
     int i = 0;
-- 
cgit v0.12