Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Add Q_AUTOTEST_EXPORT
  Ensure PathView mappedRange is updated when pathItemCount changes.
  Doc
  Fix basic types docs indentation
  Improve basic types documentation. Don't imply that Item has
  Remove Media elements from Elements index
  Add some Q_AUTOTEST_EXPORTs
  Keep ListView highlight in sync when currentItem changes geometry.
  QDeclarativeImage::updatePaintedGeometry() does not need to be a slot
  QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientations
  Text should update when the alignment changes.
  Add qml import plugins to qt.iby and qt.sis
  Take into account platform differences in input panel support
  More autoScroll fixes
  Doc fixes and improvements - fix some example code, link to
  Add Vector3dAnimation to list of QML elements

1 files changed, 5 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 134bd6d..9949e65 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -97,9 +97,11 @@ QT_BEGIN_NAMESPACE
 
     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
+    The following example moves the Y axis of the \l Rectangle elements while still allowing the \l Row element
     to lay the items out as if they had not been transformed:
     \qml
+    import Qt 4.7
+
     Row {
         Rectangle {
             width: 100; height: 100
@@ -113,6 +115,8 @@ QT_BEGIN_NAMESPACE
         }
     }
     \endqml
+
+    \image translate.png
 */
 
 /*!