diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-04-29 16:20:49 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-04-29 16:20:49 (GMT) |
| commit | c07b3bd9c3c2d7195dfa52547961647a963c8d41 (patch) | |
| tree | 0b42f47ea673a9aab395f7b9267158f1dfb11c37 /doc | |
| parent | c11686d88a4329c4c86d1b7090fbe5c004c42f64 (diff) | |
| download | Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.zip Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.tar.gz Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.tar.bz2 | |
Merged local changes.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/animation.qdoc | 14 | ||||
| -rw-r--r-- | doc/src/groups.qdoc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/animation.qdoc b/doc/src/animation.qdoc index 081660c..5eb2eda 100644 --- a/doc/src/animation.qdoc +++ b/doc/src/animation.qdoc @@ -40,7 +40,7 @@ ****************************************************************************/ /*! - \page animation.html + \page animation-overview.html \title The Animation Framework \ingroup architecture \ingroup animation @@ -132,7 +132,7 @@ \endcode This code will move \c button from the top left corner of the - screen to the position (250, 250). + screen to the position (250, 250) in 10 seconds (10000 milliseconds). The example above will do a linear interpolation between the start and end value. It is also possible to set values @@ -162,7 +162,7 @@ that is not declared as a Qt property. The only requirement is that this value has a setter. You can then subclass the class containing the value and declare a property that uses this setter. - Note that all Qt properties requires a getter, so you will need to + Note that each Qt property requires a getter, so you will need to provide a getter yourself if this is not defined. \code @@ -184,9 +184,9 @@ \section1 Animations and the Graphics View Framework When you want to animate \l{QGraphicsItem}s, you also use - QPropertyAnimation. But, unfortunetly, QGraphicsItem does not - inherit QObject. A good solution is to subclass the graphics item - you wish to animate. This class will then also inherit QObject. + QPropertyAnimation. However, QGraphicsItem does not inherit QObject. + A good solution is to subclass the graphics item you wish to animate. + This class will then also inherit QObject. This way, QPropertyAnimation can be used for \l{QGraphicsItem}s. The example below shows how this is done. Another possibility is to inherit QGraphicsWidget, which already is a QObject. @@ -326,7 +326,7 @@ When using a \l{The State Machine Framework}{state machine}, we have a special state, QAnimationState, that will play one or more animations. - + The QState::addAnimatedTransition() convenience function lets you associate an animation to a state transition. The function will create the QAnimationState for you, and insert it into the state diff --git a/doc/src/groups.qdoc b/doc/src/groups.qdoc index 0411c3a..fda54dc 100644 --- a/doc/src/groups.qdoc +++ b/doc/src/groups.qdoc @@ -69,7 +69,7 @@ */ /*! - \group animations + \group animation \ingroup groups \title Animation Framework |