Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 810698fb4e..55a672aae1 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -6680,13 +6680,13 @@ void tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunning()
     } emitter;
 
     initialState.addTransition(&emitter, &Emitter::signalWithNoArg, &finalState);
-    QTimer::singleShot(0, [&]() {
-        metaObject()->invokeMethod(&emitter, "emitSignalWithNoArg");
-        metaObject()->invokeMethod(&emitter, "emitSignalWithNoArg");
-    });
     machine.addState(&initialState);
     machine.addState(&finalState);
     machine.setInitialState(&initialState);
+    connect(&machine, &QStateMachine::started, &emitter, [&]() {
+        metaObject()->invokeMethod(&emitter, "emitSignalWithNoArg");
+        metaObject()->invokeMethod(&emitter, "emitSignalWithNoArg");
+    });
     connect(&machine, &QStateMachine::finished, &emitter.thread, &QThread::quit);
     machine.start();
     QSignalSpy emittedSpy(&emitter, &SignalEmitter::signalWithNoArg);