AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enter initial state before QStateMachine::started() is emitted

Browse Source 
The documentation says that started() "is emitted when the state
machine has entered its initial state", but the implementation
didn't adhere to that.

The consequence is that if you e.g. emitted a signal from a slot
connected to started(), and that signal was used by a transition
from the initial state, the signal would effectively get ignored and
the state machine would remain in the initial state.

Task-number: QTBUG-24307
Change-Id: Ibbeb627d517eaff821d88e256a949eacf6aae350
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
This commit is contained in:
Kent Hansen 2012-05-31 13:33:14 +02:00 committed by Qt by Nokia
parent 2682165708
commit f7c2ba9bbe
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/statemachine/qstatemachine.cpp
View File

@ -1203,7 +1203,6 @@ void QStateMachinePrivate::_q_start()
#endif
state = Running;
processingScheduled = true; // we call _q_process() below
emit q->started();
QState *start = startState();
Q_ASSERT(start != 0);
@ -1230,6 +1229,9 @@ void QStateMachinePrivate::_q_start()
#ifdef QSTATEMACHINE_DEBUG
qDebug() << q << ": initial configuration:" << configuration;
#endif
emit q->started();
_q_process();
}

18
tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
View File

@ -175,6 +175,8 @@ private slots:
void stopInTransitionToFinalState();
void stopInEventTest_data();
void stopInEventTest();
void initialStateIsEnteredBeforeStartedEmitted();
};
class TestState : public QState
@ -3906,5 +3908,21 @@ void tst_QStateMachine::stopInEventTest()
QVERIFY(machine.configuration().contains(s1));
}
void tst_QStateMachine::initialStateIsEnteredBeforeStartedEmitted()
{
QStateMachine machine;
QState *s1 = new QState(&machine);
machine.setInitialState(s1);
QFinalState *s2 = new QFinalState(&machine);
// When started() is emitted, s1 should be the active state, and this
// transition should trigger.
s1->addTransition(&machine, SIGNAL(started()), s2);
QSignalSpy finishedSpy(&machine, SIGNAL(finished()));
machine.start();
QTRY_COMPARE(finishedSpy.count(), 1);
}
QTEST_MAIN(tst_QStateMachine)
#include "tst_qstatemachine.moc"