diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 11:39:16 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 11:39:16 +0100 |
| commit | d369ae7b831744c796571aa86b5d6570b09e70e4 (patch) | |
| tree | 0ad8abef937ac3009f32b600a8e3b5644d7c637c /src/gui/graphicsview/qgraphicslayout.cpp | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| parent | 044708cb7f7fd1f2d7b18d20269422e7f3a1cb83 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicslayout.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicslayout.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp index 91f386f0bc..40f7c1b3c2 100644 --- a/src/gui/graphicsview/qgraphicslayout.cpp +++ b/src/gui/graphicsview/qgraphicslayout.cpp @@ -307,10 +307,13 @@ void QGraphicsLayout::invalidate() // does not call the base implementation? In addition, updateGeometry() // does more than we need. layoutItem->d_func()->sizeHintCacheDirty = true; + layoutItem->d_func()->sizeHintWithConstraintCacheDirty = true; layoutItem = layoutItem->parentLayoutItem(); } - if (layoutItem) + if (layoutItem) { layoutItem->d_func()->sizeHintCacheDirty = true; + layoutItem->d_func()->sizeHintWithConstraintCacheDirty = true; + } bool postIt = layoutItem ? !layoutItem->isLayout() : false; if (postIt) { |