diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
| commit | 3a6f5735ee723ff998114314c5ccdf6609667f6f (patch) | |
| tree | 9c877dd1e35972fa336cea8a61986594f168b49c /src/quick/items/qquickitem.cpp | |
| parent | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (diff) | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index d0417c80f3..ce23b99e8c 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3068,9 +3068,9 @@ void QQuickItemPrivate::_q_resourceObjectDeleted(QObject *object) relationship with other items. 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. + The \l anchors.margins property can be used to set all of the various margins at once, to the same value. It will not override a specific margin that has been previously set; to clear an explicit margin - set it's value to \c undefined. + set its value to \c undefined. Note that margins are anchor-specific and are not applied if an item does not use anchors. @@ -3117,14 +3117,14 @@ void QQuickItemPrivate::_q_resourceObjectDeleted(QObject *object) \endqml \endtable - \c anchors.fill provides a convenient way for one item to have the + \l anchors.fill provides a convenient way for one item to have the same geometry as another item, and is equivalent to connecting all four directional anchors. To clear an anchor value, set it to \c undefined. - \c anchors.alignWhenCentered (default true) forces centered anchors to align to a - whole pixel, i.e. if the item being centered has an odd width/height the item + \l anchors.alignWhenCentered (default \c true) forces centered anchors to align to a + whole pixel; if the item being centered has an odd \l width or \l height, the item will be positioned on a whole pixel rather than being placed on a half-pixel. This ensures the item is painted crisply. There are cases where this is not desirable, for example when rotating the item jitters may be apparent as the |