Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I639eb3acef7004a20447bbb66fb44661bf8e952e

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp
index f09ad42..99d6661 100644
--- a/tests/auto/statemachine/tst_statemachine.cpp
+++ b/tests/auto/statemachine/tst_statemachine.cpp
@@ -51,6 +51,7 @@ private Q_SLOTS:
     void eventOccurred();
 
     void doneDotStateEvent();
+    void running();
 };
 
 void tst_StateMachine::stateNames_data()
@@ -365,6 +366,26 @@ void tst_StateMachine::doneDotStateEvent()
     QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success")));
 }
 
+void tst_StateMachine::running()
+{
+    QScopedPointer<QScxmlStateMachine> stateMachine(
+                QScxmlStateMachine::fromFile(QString(":/tst_statemachine/statenames.scxml")));
+    QVERIFY(!stateMachine.isNull());
+
+    QSignalSpy runningChangedSpy(stateMachine.data(), SIGNAL(runningChanged(bool)));
+
+    QCOMPARE(stateMachine->isRunning(), false);
+
+    stateMachine->start();
+
+    QCOMPARE(runningChangedSpy.count(), 1);
+    QCOMPARE(stateMachine->isRunning(), true);
+
+    stateMachine->stop();
+
+    QCOMPARE(runningChangedSpy.count(), 2);
+    QCOMPARE(stateMachine->isRunning(), false);
+}
 
 QTEST_MAIN(tst_StateMachine)