diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-05 11:33:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 15:00:38 +0200 |
| commit | 5049cff4969b969a3bec5d14945a07972bdb17bc (patch) | |
| tree | da96635c3c6dd9887677db17b430f99f31f9a66e /tests | |
| parent | 57c6f22858dc2d545bab705a9b9308b3eac354de (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
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: |