diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-03 14:36:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-03 14:36:15 (GMT) |
| commit | f0844f9da7a834c282f6f04b2676f28de444e9dc (patch) | |
| tree | 8e121429e25959043cc04c4364adbe8239e44a67 /src/corelib/statemachine/qsignaltransition.cpp | |
| parent | fe763ef6cd255ccb54d0de1894c1a772f959585e (diff) | |
| parent | f360180890298618ef3284c08789c2a243e1ba9d (diff) | |
| download | Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.zip Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.tar.gz Qt-f0844f9da7a834c282f6f04b2676f28de444e9dc.tar.bz2 | |
Merge commit 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.cpp')
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp index ac2aac8..2fc6a58 100644 --- a/src/corelib/statemachine/qsignaltransition.cpp +++ b/src/corelib/statemachine/qsignaltransition.cpp @@ -249,17 +249,15 @@ void QSignalTransitionPrivate::callOnTransition(QEvent *e) { Q_Q(QSignalTransition); - QSignalEvent *se = static_cast<QSignalEvent *>(e); - int savedSignalIndex; if (e->type() == QEvent::Signal) { - savedSignalIndex = se->m_signalIndex; + QSignalEvent *se = static_cast<QSignalEvent *>(e); + int savedSignalIndex = se->m_signalIndex; se->m_signalIndex = originalSignalIndex; - } - - q->onTransition(e); - - if (e->type() == QEvent::Signal) + q->onTransition(e); se->m_signalIndex = savedSignalIndex; + } else { + q->onTransition(e); + } } QT_END_NAMESPACE |