Merge branch 'QTBUG-3524' into 4.6

2 files changed, 19 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 0e4df71..f9800bc 100644
--- a/src/gui/graphicsview/qgraphicslayout.cpp
+++ b/src/gui/graphicsview/qgraphicslayout.cpp
@@ -419,6 +419,24 @@ void QGraphicsLayout::widgetEvent(QEvent *e)
     \sa itemAt(), count()
 */
 
+/*!
+    This function is a convenience function provided for custom layouts, and will go through
+    all items in the layout and reparent their graphics items to the closest QGraphicsWidget
+    ancestor of the layout.
+
+    If \a layoutItem is already in a different layout, it will be removed  from that layout.
+
+    If custom layouts want special behaviour they can ignore to use this function, and implement
+    their own behaviour.
+
+    \sa graphicsItem()
+ */
+void QGraphicsLayout::addChildLayoutItem(QGraphicsLayoutItem *layoutItem)
+{
+    Q_D(QGraphicsLayout);
+    d->addChildLayoutItem(layoutItem);
+}
+
 QT_END_NAMESPACE
 
 #endif //QT_NO_GRAPHICSVIEW
diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/gui/graphicsview/qgraphicslayout.h
index e872980..e214a62 100644
--- a/src/gui/graphicsview/qgraphicslayout.h
+++ b/src/gui/graphicsview/qgraphicslayout.h
@@ -78,6 +78,7 @@ public:
 
 protected:
     QGraphicsLayout(QGraphicsLayoutPrivate &, QGraphicsLayoutItem *);
+    void addChildLayoutItem(QGraphicsLayoutItem *layoutItem);
 
 private:
     Q_DISABLE_COPY(QGraphicsLayout)