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, 6 insertions, 4 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index d926119..8c9d2dd 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -74,7 +74,7 @@ public:
     \inherits Item
 
     Flipable is an item that can be visibly "flipped" between its front and
-    back sides. It is used together with Rotation and State/Transition to
+    back sides. It is used together with \l Rotation and \l {State}/\l {Transition} to
     produce a flipping effect.
 
     Here is a Flipable that flips whenever it is clicked:
@@ -83,10 +83,12 @@ public:
 
     \image flipable.gif
 
-    The Rotation element is used to specify the angle and axis of the flip,
-    and the State defines the changes in angle which produce the flipping
-    effect. Finally, the Transition creates the animation that changes the
+    The \l Rotation element is used to specify the angle and axis of the flip,
+    and the \l State defines the changes in angle which produce the flipping
+    effect. Finally, the \l Transition creates the animation that changes the
     angle over one second.
+    
+    \sa {declarative/ui-components/flipable}{Flipable example}
 */
 
 /*!