diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2009-08-27 18:53:15 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2009-08-28 11:29:11 +0200 |
| commit | e88a947cd8ac7bd78922a5468cd8b631b8ccf479 (patch) | |
| tree | 72828b88f6f2b6707c61e7f131fca6ad54ed84bb /src/corelib/statemachine/qsignaltransition_p.h | |
| parent | 399d7f19ea356a29933b5a08d66b791061586c87 (diff) | |
Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.
The signal index actually emitted was different from the signal index
registered. This was due to recent changes in the meta-object protocol, where
new indexes are being created (cloned) for signals with default parameters.
When registering the transition signal, we now look for the original (non
cloned) signal index. The transition keeps track of the user-specified signal
index, and sets it when calling onTransition.
Reviewed-by: Kent Hansen
Reviewed-by: Olivier Goffart
Task-number: 260403
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition_p.h')
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 21082ab7e2..69bbcc9723 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -69,9 +69,12 @@ public: void unregister(); void maybeRegister(); + virtual void callOnTransition(QEvent *e); + QObject *sender; QByteArray signal; int signalIndex; + int originalSignalIndex; }; QT_END_NAMESPACE |