QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache

Reviewed-by: Jan-Arve Sæther

2 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 86b4589..3e95735 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 = layoutItem->parentLayoutItem();        
+        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) {
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index 016cfbf..df13039 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -128,6 +128,7 @@ QGraphicsLayoutItemPrivate::~QGraphicsLayoutItemPrivate()
 void QGraphicsLayoutItemPrivate::init()
 {
     sizeHintCacheDirty = true;
+    sizeHintWithConstraintCacheDirty = true;
     sizePolicy = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 }
 
@@ -828,6 +829,7 @@ void QGraphicsLayoutItem::updateGeometry()
 {
     Q_D(QGraphicsLayoutItem);
     d->sizeHintCacheDirty = true;
+    d->sizeHintWithConstraintCacheDirty = true;
 }
 
 /*!