diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-17 09:25:30 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-17 09:30:39 (GMT) |
| commit | 24580f35a58390b4177aef8edef1192dc05f8ac2 (patch) | |
| tree | 5a5278707052d7e700d25b814d4153702ab0f5e7 /src/corelib/statemachine | |
| parent | fe59d3a82040e7202b4330a9da36fa4591e778c9 (diff) | |
| download | Qt-24580f35a58390b4177aef8edef1192dc05f8ac2.zip Qt-24580f35a58390b4177aef8edef1192dc05f8ac2.tar.gz Qt-24580f35a58390b4177aef8edef1192dc05f8ac2.tar.bz2 | |
perform all property assignments of initial state that's nested
If the machine's initial state is nested, a set of states will
be entered, and we need to do the property assignments of all
of them.
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 04cce50..758bdbe 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1171,9 +1171,9 @@ void QStateMachinePrivate::_q_start() transitions.append(initialTransition); QEvent nullEvent(QEvent::None); executeTransitionContent(&nullEvent, transitions); - enterStates(&nullEvent, transitions); + QList<QAbstractState*> enteredStates = enterStates(&nullEvent, transitions); applyProperties(transitions, QList<QAbstractState*>() << start, - QList<QAbstractState*>() << initial); + enteredStates); delete start; #ifdef QSTATEMACHINE_DEBUG |