summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-10-28 16:24:05 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-10-29 11:48:20 (GMT)
commit30099d68599d23b7e9c39e3f2e23a1bb5c6dd7dc (patch)
treee7cce666b57c203b878ba9db98a4c2881b11fc06 /src/corelib/statemachine
parentf425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff)
downloadQt-30099d68599d23b7e9c39e3f2e23a1bb5c6dd7dc.zip
Qt-30099d68599d23b7e9c39e3f2e23a1bb5c6dd7dc.tar.gz
Qt-30099d68599d23b7e9c39e3f2e23a1bb5c6dd7dc.tar.bz2
QStateMachine::event() should call QState::event()
Since QStateMachine inherits QState now. Reviewed-by: Eskil Abrahamsen Blomfeldt
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index e182c88..154445f 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1974,7 +1974,7 @@ bool QStateMachine::event(QEvent *e)
return true;
}
}
- return QObject::event(e);
+ return QState::event(e);
}
#ifndef QT_NO_STATEMACHINE_EVENTFILTER