diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-23 05:42:13 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-23 05:42:13 (GMT) |
| commit | 0af965285378ae51ac98dfade94f216761449459 (patch) | |
| tree | 63284a53d9932b1202cad495c5e1bd2ebec208ae /src/declarative/timeline | |
| parent | 6f089aec4e6c396ce45dcab0bd58e2dda23adce1 (diff) | |
| parent | 2595bf1dd0252027ebba409f8f81d906ab9c099c (diff) | |
| download | Qt-0af965285378ae51ac98dfade94f216761449459.zip Qt-0af965285378ae51ac98dfade94f216761449459.tar.gz Qt-0af965285378ae51ac98dfade94f216761449459.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/timeline')
| -rw-r--r-- | src/declarative/timeline/gfxeasing.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/timeline/gfxtimeline.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/timeline/gfxeasing.cpp b/src/declarative/timeline/gfxeasing.cpp index c89ba88..59767b2 100644 --- a/src/declarative/timeline/gfxeasing.cpp +++ b/src/declarative/timeline/gfxeasing.cpp @@ -357,7 +357,7 @@ Q_GLOBAL_STATIC(ConfigFunctionMap, configFunctionMap); /*! \class GfxEasing - \ingroup animation + \ingroup group_animation \brief The GfxEasing class provides easing curves for controlling animation. Easing curves describe a function that controls how a value changes over diff --git a/src/declarative/timeline/gfxtimeline.cpp b/src/declarative/timeline/gfxtimeline.cpp index 36b18d0..3e84df8 100644 --- a/src/declarative/timeline/gfxtimeline.cpp +++ b/src/declarative/timeline/gfxtimeline.cpp @@ -261,7 +261,7 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change /*! \class QmlTimeLine - \ingroup animation + \ingroup group_animation \brief The QmlTimeLine class provides a timeline for controlling animations. QmlTimeLine is similar to QTimeLine except: @@ -872,7 +872,7 @@ void QmlTimeLine::remove(QmlTimeLineObject *v) /*! \class GfxValue - \ingroup animation + \ingroup group_animation \brief The GfxValue class is modified by QmlTimeLine. */ |