diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:04:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:04:35 +0200 |
commit | 384cb7975d9caa4e508454d811d2e391763e5981 (patch) | |
tree | bba0afaa2af3fab25ac4124c164c8e356cadf239 | |
parent | e9406368d46e806835c703e387b00598647cd446 (diff) | |
parent | 75cb3ffebcc7c1e617e3ba4b85adb147e30ca36e (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3
Change-Id: Id25692bc7d3915c4b9129e644e3bdd6cc35e6a68
-rw-r--r-- | src/scxml/qscxmlstatemachine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp index 13158f7..e57630f 100644 --- a/src/scxml/qscxmlstatemachine.cpp +++ b/src/scxml/qscxmlstatemachine.cpp @@ -321,6 +321,7 @@ void EventLoopHook::timerEvent(QTimerEvent *timerEvent) QScxmlEvent *scxmlEvent = it->second; smp->m_delayedEvents.erase(it); smp->routeEvent(scxmlEvent); + killTimer(timerId); return; } } |