diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 07:41:06 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 07:41:06 (GMT) |
| commit | 12ebfedc3de64e99082ca573351bdd24b1d42370 (patch) | |
| tree | 0290b22723ae07fb4b11e6f5008e5bae2050a12b /doc/src/groups.qdoc | |
| parent | 7ffe42d376b574239480b38b8f6430339b806daa (diff) | |
| parent | baec0ecd314c6e9563bd56cf19571ca71d7d11cd (diff) | |
| download | Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.zip Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.gz Qt-12ebfedc3de64e99082ca573351bdd24b1d42370.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/kernel/qcoreevent.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'doc/src/groups.qdoc')
| -rw-r--r-- | doc/src/groups.qdoc | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/src/groups.qdoc b/doc/src/groups.qdoc index c9cedc4..3c4da53 100644 --- a/doc/src/groups.qdoc +++ b/doc/src/groups.qdoc @@ -69,6 +69,18 @@ */ /*! + \group animation + \ingroup groups + + \title Animation Framework + \brief Classes for animations, states and transitions. + + These classes provide a framework for creating both simple and complex + animations. \l{The Animation Framework} also provides states and animated + transitions, making it easy to create animated stateful forms. +*/ + +/*! \group abstractwidgets \title Abstract Widget Classes \ingroup groups @@ -597,3 +609,14 @@ These classes are relevant to developers who are working with Qt Script's debugging features. */ + +/*! + \group statemachine + \ingroup groups + + \title State Machine Classes + \brief Classes for constructing and executing state graphs. + + These classes are provided by \l{The State Machine Framework} for creating + event-driven state machines. +*/ |