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 /src/gui/statemachine | |
parent | c11686d88a4329c4c86d1b7090fbe5c004c42f64 (diff) | |
download | Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.zip Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.tar.gz Qt-c07b3bd9c3c2d7195dfa52547961647a963c8d41.tar.bz2 |
Merged local changes.
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 4e3fa11..189332d 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 83254dc..a330c78 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. */ |