summaryrefslogtreecommitdiffstats
path: root/src/gui/statemachine
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-14 14:01:53 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-05-14 14:01:53 (GMT)
commit077c35c2fc4b41846e953c2e880ce1bff396a715 (patch)
tree4c0f12dd459ab198d1364c544c9d0fa29d76eeb9 /src/gui/statemachine
parentf3418105d25fe9a9fea5b94715d9ec04ca268ee7 (diff)
parent2a4f5a1b4e6e9632ab18c81c3e06ebf2061cd765 (diff)
downloadQt-077c35c2fc4b41846e953c2e880ce1bff396a715.zip
Qt-077c35c2fc4b41846e953c2e880ce1bff396a715.tar.gz
Qt-077c35c2fc4b41846e953c2e880ce1bff396a715.tar.bz2
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'src/gui/statemachine')
-rw-r--r--src/gui/statemachine/qbasickeyeventtransition.cpp2
-rw-r--r--src/gui/statemachine/qbasicmouseeventtransition.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 7336612..7f515cd 100644
--- a/src/gui/statemachine/qbasickeyeventtransition.cpp
+++ b/src/gui/statemachine/qbasickeyeventtransition.cpp
@@ -25,6 +25,8 @@ QT_BEGIN_NAMESPACE
/*!
\internal
\class QBasicKeyEventTransition
+ \since 4.6
+ \ingroup statemachine
\brief The QBasicKeyEventTransition class provides a transition for Qt key events.
*/
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/gui/statemachine/qbasicmouseeventtransition.cpp
index c4c2302..42b7580 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition.cpp
+++ b/src/gui/statemachine/qbasicmouseeventtransition.cpp
@@ -25,6 +25,8 @@ QT_BEGIN_NAMESPACE
/*!
\internal
\class QBasicMouseEventTransition
+ \since 4.6
+ \ingroup statemachine
\brief The QBasicMouseEventTransition class provides a transition for Qt mouse events.
*/