diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-13 23:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-13 23:00:15 (GMT) |
| commit | 4b1664447940a4674d0551f626561a30cfa3ce8f (patch) | |
| tree | b2b9e8e74bfc52339ff2d95c0b927544567aeea9 /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | 21fd6c0d818f3f4a3efa8904c8ddbfeb3a1e931d (diff) | |
| parent | ff60c64c30a2e889b7a894b7b4b38484b7dfe31a (diff) | |
| download | Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.zip Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.tar.gz Qt-4b1664447940a4674d0551f626561a30cfa3ce8f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 11286b0..24d9b03 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1831,9 +1831,9 @@ void QDeclarativeItem::setClip(bool c) /*! \qmlproperty real Item::z - Sets the stacking order of the item. By default the stacking order is 0. + Sets the stacking order of sibling items. By default the stacking order is 0. - Items with a higher stacking value are drawn on top of items with a + Items with a higher stacking value are drawn on top of siblings with a lower stacking order. Items with the same stacking value are drawn bottom up in the order they appear. Items with a negative stacking value are drawn under their parent's content. @@ -2134,6 +2134,8 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const Margins apply to top, bottom, left, right, and fill anchors. The \c anchors.margins property can be used to set all of the various margins at once, to the same value. + Note that margins are anchor-specific and are not applied if an item does not + use anchors. Offsets apply for horizontal center, vertical center, and baseline anchors. |