diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 18:00:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 18:00:24 (GMT) |
| commit | d5af2a592a0ed062d954d1c29fae76e0001fb5d7 (patch) | |
| tree | 0496d73cb0676e3e0abf6504ac79e341c930f6e1 /src | |
| parent | f32bd56e86d188116d0a83e84eea52528cce9c76 (diff) | |
| parent | 542fe69cdeff81acb8f986ff4606043613345dc2 (diff) | |
| download | Qt-d5af2a592a0ed062d954d1c29fae76e0001fb5d7.zip Qt-d5af2a592a0ed062d954d1c29fae76e0001fb5d7.tar.gz Qt-d5af2a592a0ed062d954d1c29fae76e0001fb5d7.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f
Make sure that d->init() is called from both ctors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicslayoutitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index df13039..0a24aae 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(); + d->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; } |