diff options
-rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 2 | ||||
-rw-r--r-- | tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index fcaebff148..927389a33b 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1396,6 +1396,7 @@ namespace _QStateMachine_Internal{ class GoToStateTransition : public QAbstractTransition { + Q_OBJECT public: GoToStateTransition(QAbstractState *target) : QAbstractTransition() @@ -2396,6 +2397,7 @@ QStateMachine::WrappedEvent::~WrappedEvent() QT_END_NAMESPACE +#include "qstatemachine.moc" #include "moc_qstatemachine.cpp" #endif //QT_NO_STATEMACHINE diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index 08181c17de..21572218ec 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -206,6 +206,7 @@ private slots: void nestedStateMachines(); void goToState(); + void goToStateFromSourceWithTransition(); void task260403_clonedSignals(); void postEventFromOtherThread(); @@ -4256,6 +4257,24 @@ void tst_QStateMachine::goToState() QVERIFY(machine.configuration().contains(s2_1)); } +void tst_QStateMachine::goToStateFromSourceWithTransition() +{ + // QTBUG-21813 + QStateMachine machine; + QState *s1 = new QState(&machine); + s1->addTransition(new QSignalTransition); + QState *s2 = new QState(&machine); + machine.setInitialState(s1); + QSignalSpy startedSpy(&machine, SIGNAL(started())); + machine.start(); + QTRY_COMPARE(startedSpy.count(), 1); + + QStateMachinePrivate::get(&machine)->goToState(s2); + QCoreApplication::processEvents(); + QCOMPARE(machine.configuration().size(), 1); + QVERIFY(machine.configuration().contains(s2)); +} + class CloneSignalTransition : public QSignalTransition { public: |