Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index cfbb88a123..8c76809c48 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -252,6 +252,7 @@ private slots:
     void conflictingTransition2();
     void qtbug_46059();
     void qtbug_46703();
+    void postEventFromBeginSelectTransitions();
 };
 
 class TestState : public QState
@@ -6606,5 +6607,33 @@ void tst_QStateMachine::qtbug_46703()
     QVERIFY(machine.isRunning());
 }
 
+void tst_QStateMachine::postEventFromBeginSelectTransitions()
+{
+    class StateMachine : public QStateMachine {
+    protected:
+        void beginSelectTransitions(QEvent* e) Q_DECL_OVERRIDE {
+            if (e->type() == QEvent::Type(QEvent::User + 2))
+                postEvent(new QEvent(QEvent::Type(QEvent::User + 1)), QStateMachine::HighPriority);
+        }
+    } machine;
+    QState a(&machine);
+    QState success(&machine);
+
+    machine.setInitialState(&a);
+    a.addTransition(new EventTransition(QEvent::Type(QEvent::User + 1), &success));
+
+    machine.start();
+
+    QTRY_COMPARE(machine.configuration().contains(&a), true);
+    QTRY_COMPARE(machine.configuration().contains(&success), false);
+
+    machine.postEvent(new QEvent(QEvent::Type(QEvent::User + 2)), QStateMachine::NormalPriority);
+
+    QTRY_COMPARE(machine.configuration().contains(&a), false);
+    QTRY_COMPARE(machine.configuration().contains(&success), true);
+
+    QVERIFY(machine.isRunning());
+}
+
 QTEST_MAIN(tst_QStateMachine)
 #include "tst_qstatemachine.moc"