diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 10:44:54 +0200 |
---|---|---|
committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-30 10:44:54 +0200 |
commit | 214a26fbde1c5600a10db59217ae9b63a46bce9e (patch) | |
tree | 601e9edf2832834f0ffef9c7b5c54303ce2f70d2 /doc/src/declarative | |
parent | 7f27ebb0383414f15f391151655e5b09952f8ccd (diff) | |
parent | ad203bc0bd17be1ade143e38cdc7e8eca26ebc07 (diff) | |
download | qt4-tools-214a26fbde1c5600a10db59217ae9b63a46bce9e.tar.gz |
Merge branch '4.8'
Conflicts:
doc/src/declarative/righttoleft.qdoc
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 7 | ||||
-rw-r--r-- | doc/src/declarative/righttoleft.qdoc | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 41b04e88c8..e93e5399f9 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -53,7 +53,12 @@ Rectangle { id: rect1; ... } Rectangle { id: rect2; anchors.left: rect1.right; ... } \endcode -In this case, the left edge of \e rect2 is bound to the right edge of \e rect1, producing the following: +Each Item has two properties for each anchor line: one to bind from and one to bind to. The properties to bind +from are contained in the \l{Item::}{anchors} attached property (seen as \c {anchors.left} above). +The properties to bind to are normal properties (seen as \c {rect1.right} above). +This way, each item can have several bindings to the same anchor line. Note that the properties to bind to are +not visible in the documentation for Item. +So in the example above, the left edge of \e rect2 is bound to the right edge of \e rect1, producing the following: \image edge1.png diff --git a/doc/src/declarative/righttoleft.qdoc b/doc/src/declarative/righttoleft.qdoc index 1f2cd08352..58c266c79f 100644 --- a/doc/src/declarative/righttoleft.qdoc +++ b/doc/src/declarative/righttoleft.qdoc @@ -100,12 +100,8 @@ Or set all child elements to also inherit the layout direction: \snippet doc/src/snippets/declarative/righttoleft.qml 3 Applying mirroring in this manner does not change the actual value of the relevant anchor, -\c layoutDirection or \c horizontalAlignment properties. The separate read-only property -\c effectiveLayoutDirection can be used to query the effective layout -direction of positioners and model views that takes the mirroring into account. Similarly the \l Text, -\l TextInput and \l TextEdit elements have gained the read-only property \c effectiveHorizontalAlignment -for querying the effective visual alignment of text. For anchors, the read only -\l {Item::anchors.top}{anchors.mirrored} property reflects whether anchors have been mirrored. +\c layoutDirection or \c horizontalAlignment properties. You can use \c LayoutMirroring.enabled to +query whether the mirroring is in effect. Note that application layouts and animations that are defined using \l {Item::}{x} property values (as opposed to anchors or positioner elements) are not affected by the \l LayoutMirroring attached property. |