summaryrefslogtreecommitdiffstats
path: root/src/gui/statemachine/qbasickeyeventtransition.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-18 06:40:15 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-18 06:40:15 (GMT)
commit0add74a9339a9d7dda302aa4f31cbb50bdb69908 (patch)
tree9d2c767bee200cb79f81aed24551bcb1989eefb7 /src/gui/statemachine/qbasickeyeventtransition.cpp
parentc22504ae79b45268d603c2b2bc66bd2a59c331c7 (diff)
parent3769beacd9126b567f6a42e6c357a7eda004a602 (diff)
downloadQt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.zip
Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.gz
Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/statemachine/qbasickeyeventtransition.cpp')
-rw-r--r--src/gui/statemachine/qbasickeyeventtransition.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 7821feb..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.
*/
@@ -156,7 +158,7 @@ void QBasicKeyEventTransition::setModifiersMask(Qt::KeyboardModifiers modifiersM
/*!
\reimp
*/
-bool QBasicKeyEventTransition::eventTest(QEvent *event) const
+bool QBasicKeyEventTransition::eventTest(QEvent *event)
{
Q_D(const QBasicKeyEventTransition);
if (event->type() == d->eventType) {