diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-11-28 10:59:12 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:31:38 (GMT) |
| commit | 40fb4750910e23d3e7128ca8e0f1c5920b05bd5a (patch) | |
| tree | 3ecce1e68f83c1cbb3e22cf3c74a27f515099d5e /src/gui/graphicsview | |
| parent | 1ac0ae47bd2271149241ae715f03252d7015459c (diff) | |
| download | Qt-40fb4750910e23d3e7128ca8e0f1c5920b05bd5a.zip Qt-40fb4750910e23d3e7128ca8e0f1c5920b05bd5a.tar.gz Qt-40fb4750910e23d3e7128ca8e0f1c5920b05bd5a.tar.bz2 | |
Various qt documentation fixes (wk 43)
Task-number: QTBUG-12389
Task-number: QTBUG-16667
Task-number: QTBUG-6151
Task-number: QTBUG-8625
Task-number: QTBUG-19808
Task-number: QTBUG-12096
Task-number: QTBUG-1231
Task-number: QTBUG-21073
Task-number: QTBUG-8939
Task-number: QTBUG-20399
Task-number: QTBUG-20944
Task-number: QTBUG-7542
Task-number: QTBUG-22095
Task-number: QTBUG-11278
Task-number: QTBUG-15653
Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 6 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicslayout.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 2b8b625..d4109ca 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -11068,9 +11068,9 @@ QGraphicsItemGroup::~QGraphicsItemGroup() } /*! - Adds the given \a item to this item group. The item will be - reparented to this group, but its position and transformation - relative to the scene will stay intact. + Adds the given \a item and item's child items to this item group. + The item and child items will be reparented to this group, but its + position and transformation relative to the scene will stay intact. \sa removeFromGroup(), QGraphicsScene::createItemGroup() */ diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp index 80896ec..1b38dfb 100644 --- a/src/gui/graphicsview/qgraphicslayout.cpp +++ b/src/gui/graphicsview/qgraphicslayout.cpp @@ -102,6 +102,10 @@ QT_BEGIN_NAMESPACE any way, but for a linear layout, the order is essential. When writing your own layout subclass, you are free to choose the API that best suits your layout. + For adding layout items to the custom layout, the QGraphicsLayout provides + convenience function addChildLayoutItem(). The function will take care of + automatically reparenting graphics items, if needed. + \section1 Activating the Layout When the layout's geometry changes, QGraphicsLayout immediately rearranges |