Changeset 846 for trunk/src/gui/graphicsview/qgraphicslayout.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgraphicslayout.cpp (modified) (2 diffs)

trunk/src/gui/graphicsview/qgraphicslayout.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -308 +308 @@
         // does more than we need.
         layoutItem->d_func()->sizeHintCacheDirty = true;
-        layoutItem = layoutItem->parentLayoutItem();        
-    }
-    if (layoutItem)
+        layoutItem->d_func()->sizeHintWithConstraintCacheDirty = true;
+        layoutItem = layoutItem->parentLayoutItem();
+    }
+    if (layoutItem) {
         layoutItem->d_func()->sizeHintCacheDirty = true;
+        layoutItem->d_func()->sizeHintWithConstraintCacheDirty = true;
+    }
 
     bool postIt = layoutItem ? !layoutItem->isLayout() : false;