summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2012-09-07 16:04:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-11 12:09:47 +0200
commit99d3eecce2f9545290d4eb09d048c36ca84e1b0e (patch)
treef1f5c339718bfacbc721a2ebdf14b4a1a6463c9f /src/widgets
parentf957370206fb88b40c354f2ca57ecfd315e3ac29 (diff)
Doc: Remove references to the deprecated QGraphicsItemAnimation
Task-number: QTBUG-23711 Change-Id: I1c1ce049016d0bea03d43631493ed8d248162eee Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Jason Barron <jason.barron@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp9
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp5
2 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index b82190575f..44b620ee3b 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -4498,12 +4498,11 @@ void QGraphicsItem::resetTransform()
The default implementation does nothing.
- For individual item animation, an alternative to this function is to
- either use QGraphicsItemAnimation, or to multiple-inherit from QObject and
- QGraphicsItem, and animate your item using QObject::startTimer() and
- QObject::timerEvent().
+ This function is intended for animations. An alternative is to
+ multiple-inherit from QObject and QGraphicsItem and use the \l{The Animation
+ Framework}{Animation Framework}.
- \sa QGraphicsItemAnimation, QTimeLine
+ \sa QGraphicsScene::advance(), QTimeLine
*/
void QGraphicsItem::advance(int phase)
{
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 07f1119dde..15b1fe51a0 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -3221,7 +3221,10 @@ QList <QGraphicsView *> QGraphicsScene::views() const
move. In the first phase, QGraphicsItem::advance() is called passing a
value of 0 as an argument, and 1 is passed in the second phase.
- \sa QGraphicsItem::advance(), QGraphicsItemAnimation, QTimeLine
+ Note that you can also use the \l{The Animation Framework}{Animation
+ Framework} for animations.
+
+ \sa QGraphicsItem::advance(), QTimeLine
*/
void QGraphicsScene::advance()
{