summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-12 07:44:51 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-12 07:46:52 (GMT)
commitdd24ba2bc9c6c25fe2e7ba3f308253ae7dfc4cb7 (patch)
treee2d198e163251447daf15fdb89c165933feaee34 /src/gui/itemviews
parent90a082c9076f35dcca092ade019891e92692710e (diff)
downloadQt-dd24ba2bc9c6c25fe2e7ba3f308253ae7dfc4cb7.zip
Qt-dd24ba2bc9c6c25fe2e7ba3f308253ae7dfc4cb7.tar.gz
Qt-dd24ba2bc9c6c25fe2e7ba3f308253ae7dfc4cb7.tar.bz2
Revert merge commit 3945fd75a93d790434b33c2d23a
The resolution of conflicts introduced regressions. And the commit was already in 4.6
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qheaderview.cpp2
1 files changed, 1 insertions, 1 deletions
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;