summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstatemachine_p.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-13 11:56:44 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-05-13 11:59:49 (GMT)
commita82714c6c82f682e02969d9afa551f37f8132653 (patch)
tree019c7150eb761c0f3463734a4ccdef1147fd8feb /src/corelib/statemachine/qstatemachine_p.h
parentb75c6210c7fa225e86d2c4bff239bb050321998d (diff)
downloadQt-a82714c6c82f682e02969d9afa551f37f8132653.zip
Qt-a82714c6c82f682e02969d9afa551f37f8132653.tar.gz
Qt-a82714c6c82f682e02969d9afa551f37f8132653.tar.bz2
correctly handle multiple event transitions for same (object,event)
The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
Diffstat (limited to 'src/corelib/statemachine/qstatemachine_p.h')
-rw-r--r--src/corelib/statemachine/qstatemachine_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 9b4b861..dfa5575 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -200,7 +200,7 @@ public:
QHash<const QObject*, QVector<int> > connections;
#ifndef QT_NO_STATEMACHINE_EVENTFILTER
- QHash<QObject*, QSet<QEvent::Type> > qobjectEvents;
+ QHash<QObject*, QHash<QEvent::Type, int> > qobjectEvents;
#endif
QHash<int, QEvent*> delayedEvents;