Merge commit 'd9fa92' into origin-4.6

1 files changed, 4 insertions, 10 deletions

diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 1503f53..ba89c7d 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -437,13 +437,10 @@
       \section2 Animation
 
         Graphics View supports animation at several levels. You can easily
-        assemble animation paths by associating a QGraphicsItemAnimation with
-        your item. This allows timeline controlled animations that operate at
-        a steady speed on all platforms (although the frame rate may vary
-        depending on the platform's performance).  QGraphicsItemAnimation
-        allows you to create a path for an item's position, rotation, scale,
-        shear and translation. The animation can be controlled by a QSlider,
-        or more commonly by QTimeLine.
+        assemble animation by using the Animation Framework. For that you'll
+		need your items to inherit from QGraphicsObject and associate 
+		QPropertyAnimation with them. QPropertyAnimation allows to animate any 
+		QObject property.
 
         Another option is to create a custom item that inherits from QObject
         and QGraphicsItem. The item can the set up its own timers, and control
@@ -454,9 +451,6 @@
         QGraphicsScene::advance(), which in turn calls
         QGraphicsItem::advance().
 
-        See also the \l{Drag and Drop Robot Example}{Drag and Drop Robot}
-        example for an illustration of timeline-based animation techniques.
-
       \section2 OpenGL Rendering
 
         To enable OpenGL rendering, you simply set a new QGLWidget as the