diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-22 03:10:30 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-22 03:10:30 (GMT) |
| commit | 93116be19628239b82ba19f814374b2fcabd7c96 (patch) | |
| tree | 9c814eec99273ddb04d15f81a5a559a060d74817 | |
| parent | 329897ea89f0cc01e95873cc0f7722588ab3e817 (diff) | |
| download | Qt-93116be19628239b82ba19f814374b2fcabd7c96.zip Qt-93116be19628239b82ba19f814374b2fcabd7c96.tar.gz Qt-93116be19628239b82ba19f814374b2fcabd7c96.tar.bz2 | |
Doc fixes.
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 3298699..35d746b 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -35,7 +35,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l SetPropertyAction \o \l ParentChangeAction \o \l Transition -\o \l Behaviour +\o \l Behavior \o \l Follow \endlist diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 079d691..0c4d97b 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1433,7 +1433,7 @@ void QFxItem::setBaselineOffset(int offset) \qmlproperty real Item::rotation This property holds the rotation of the item in degrees. - This specifies how many degrees to rotate the item around its origin (0,0). + This specifies how many degrees to rotate the item around its transformOrigin. The default rotation is 0 degrees (i.e. not rotated at all). \table @@ -1468,7 +1468,7 @@ void QFxItem::setBaselineOffset(int offset) \property QFxItem::rotation This property holds the rotation of the item in degrees. - This specifies how many degrees to rotate the item around its origin (0,0). + This specifies how many degrees to rotate the item around its transformOrigin. The default rotation is 0 degrees (i.e. not rotated at all). */ qreal QFxItem::rotation() const @@ -1511,7 +1511,7 @@ void QFxItem::setRotation(qreal rotation) By default, items are displayed at a scale of 1 (i.e. at their normal size). - Scaling is from the item's origin (0,0). + Scaling is from the item's transformOrigin. \table \row @@ -1547,7 +1547,7 @@ void QFxItem::setRotation(qreal rotation) By default, items are displayed at a scale of 1 (i.e. at their normal size). - Scaling is from the item's origin (0,0). + Scaling is from the item's transformOrigin. */ qreal QFxItem::scale() const { |