summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/declarative/elements.qdoc1
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp15
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 2f9e7bf..5eaaf7e 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -147,6 +147,7 @@ The following table lists the QML elements provided by the Qt Declarative module
\list
\o \l Scale
\o \l Rotation
+\o \l Translate
\endlist
\header
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 05e13a7..83c79a0 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -77,13 +77,20 @@ QT_BEGIN_NAMESPACE
\since 4.7
\brief The Transform elements provide a way of building advanced transformations on Items.
+ The Transform element is a base type which cannot be instantiated directly.
+ The following concrete Transform types are available:
+
+ \list
+ \o \l Rotation
+ \o \l Scale
+ \o \l Translate
+ \endlist
+
The Transform elements let you create and control advanced transformations that can be configured
independently using specialized properties.
You can assign any number of Transform elements to an Item. Each Transform is applied in order,
one at a time, to the Item it's assigned to.
-
- \sa Rotation, Scale, Translate
*/
/*!
@@ -91,7 +98,7 @@ QT_BEGIN_NAMESPACE
\since 4.7
\brief The Translate object provides a way to move an Item without changing its x or y properties.
- The Translate object independent control over position in addition to the Item's x and y properties.
+ The Translate object provides independent control over position in addition to the Item's x and y properties.
The following example moves the Y axis of the Rectangles while still allowing the Row element
to lay the items out as if they had not been transformed:
@@ -118,7 +125,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlproperty real Translate::yTranslate
+ \qmlproperty real Translate::y
The translation along the Y axis.
*/