diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-05-14 16:01:53 +0200 |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-05-14 16:01:53 +0200 |
commit | 077c35c2fc4b41846e953c2e880ce1bff396a715 (patch) | |
tree | 4c0f12dd459ab198d1364c544c9d0fa29d76eeb9 /src/gui/statemachine | |
parent | f3418105d25fe9a9fea5b94715d9ec04ca268ee7 (diff) | |
parent | 2a4f5a1b4e6e9632ab18c81c3e06ebf2061cd765 (diff) | |
download | qt4-tools-077c35c2fc4b41846e953c2e880ce1bff396a715.tar.gz |
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'src/gui/statemachine')
-rw-r--r-- | src/gui/statemachine/qbasickeyeventtransition.cpp | 2 | ||||
-rw-r--r-- | src/gui/statemachine/qbasicmouseeventtransition.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp index 7336612d1c..7f515cdbc7 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 c4c2302894..42b7580322 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. */ |