From 5049cff4969b969a3bec5d14945a07972bdb17bc Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 5 Oct 2011 11:33:01 +0200 Subject: Add missing Q_OBJECT macro to GoToStateTransition The missing macro caused qFindChild() to return any QAbstractTransition. Task-number: QTBUG-21813 Change-Id: I80507aa86c8c32d7fa59a1b5ae551043f5f90315 Reviewed-on: http://codereview.qt-project.org/6044 Reviewed-by: Qt Sanity Bot Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../statemachine/qstatemachine/tst_qstatemachine.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/auto/corelib/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: -- cgit v1.2.3