diff options
Diffstat (limited to 'doc/src/animation.qdoc')
| -rw-r--r-- | doc/src/animation.qdoc | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/doc/src/animation.qdoc b/doc/src/animation.qdoc index c16d6a2..da9b401 100644 --- a/doc/src/animation.qdoc +++ b/doc/src/animation.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -208,12 +208,6 @@ Note that QObject must be the first class inherited as the meta-object system demands this. - \warning The QItemAnimation class, which was initially intended - for animating \l{QGraphicsItem}s may be deprecated or removed from - the animation framework. - - \omit (need something about the list of animations). \endomit - \section1 Easing Curves As mentioned, QPropertyAnimation performs an interpolation between @@ -327,11 +321,12 @@ \section1 Animations and States When using a \l{The State Machine Framework}{state machine}, we - can associate an animation to a transition between states using a - QSignalTransition or QEventTransition class. These classes are both - derived from QAbstractClass, which defines the convenience function - addAnimation() that enables the appending of one or more animations - triggered when the transition occurs. + can associate one or more animations to a transition between states + using a QSignalTransition or QEventTransition class. These classes + are both derived from QAbstractTransition, which defines the + convenience function \l{QAbstractTransition::}{addAnimation()} that + enables the appending of one or more animations triggered when the + transition occurs. We also have the possibility to associate properties with the states rather than setting the start and end values ourselves. |