diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-07-12 17:03:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 12:09:42 +0200 |
| commit | 0d56dac3bce394545df37761da42ccb3ad96ccf5 (patch) | |
| tree | 71e64e46e1fb547dc45092801beb1a4d9f11e852 /src/corelib/statemachine | |
| parent | a1590325ca45406b54f80d98c7ab38f2a415d99b (diff) | |
statemachine: Set correct signal index when signal is non-normalized
The originalSignalIndex member was not set if the signature had to be
normalized. This caused the SignalEvent passed to onTransition() to
report a signal index of -1.
Improve the signal transition tests so they check both the event
passed to eventTest() and onTransition().
Change-Id: I5331fd1944d53310b6d11eb2fd8713b80faa53a1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 5adb6c3fb1..a275a108e1 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1704,6 +1704,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio meta->className(), signal.constData()); return; } + originalSignalIndex = signalIndex; } // The signal index we actually want to connect to is the one // that is going to be sent, i.e. the non-cloned original index. |