From 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Tue, 14 Dec 2010 11:46:57 +0100
Subject: Make sure that d->init() is called from both ctors.

QGraphicsLayout uses the protected ctor that did not call d->init(),
so all its subclasses was potentially suffering from this.

Task-number: QTBUG-15333
Reviewed-by: John Tapsell
---
 src/gui/graphicsview/qgraphicslayoutitem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index df13039..b11dc9e 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -129,7 +129,6 @@ void QGraphicsLayoutItemPrivate::init()
 {
     sizeHintCacheDirty = true;
     sizeHintWithConstraintCacheDirty = true;
-    sizePolicy = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 }
 
 /*!
@@ -400,6 +399,7 @@ QGraphicsLayoutItem::QGraphicsLayoutItem(QGraphicsLayoutItem *parent, bool isLay
 {
     Q_D(QGraphicsLayoutItem);
     d->init();
+    sizePolicy = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     d->q_ptr = this;
 }
 
@@ -410,6 +410,7 @@ QGraphicsLayoutItem::QGraphicsLayoutItem(QGraphicsLayoutItemPrivate &dd)
     : d_ptr(&dd)
 {
     Q_D(QGraphicsLayoutItem);
+    d->init();
     d->q_ptr = this;
 }
 
-- 
cgit v0.12