Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	mkspecs/win32-g++/qmake.conf
	src/corelib/global/qglobal_p.h
	src/corelib/global/qoperatingsystemversion_p.h
	src/corelib/io/qfilesystemengine_win.cpp
	src/network/bearer/qbearerengine.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/sql/doc/snippets/code/doc_src_sql-driver.cpp
	src/widgets/kernel/qwidget_p.h
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qfusionstyle.cpp
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp

Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 8f0d83ce32..7ea467b6ef 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -101,6 +101,7 @@ Q_OBJECT
     public:
     SignalEmitter(QObject *parent = 0)
         : QObject(parent) {}
+public Q_SLOTS:
     void emitSignalWithNoArg()
         { emit signalWithNoArg(); }
     void emitSignalWithIntArg(int arg)
@@ -251,6 +252,7 @@ private slots:
     void qtbug_46059();
     void qtbug_46703();
     void postEventFromBeginSelectTransitions();
+    void dontProcessSlotsWhenMachineIsNotRunning();
 };
 
 class TestState : public QState
@@ -6658,5 +6660,35 @@ void tst_QStateMachine::postEventFromBeginSelectTransitions()
     QVERIFY(machine.isRunning());
 }
 
+void tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunning()
+{
+    QStateMachine machine;
+    QState initialState;
+    QFinalState finalState;
+
+    struct Emitter : SignalEmitter
+    {
+        QThread thread;
+        Emitter(QObject *parent = nullptr) : SignalEmitter(parent)
+        {
+            moveToThread(&thread);
+            thread.start();
+        }
+    } 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);
+    machine.start();
+    connect(&machine, &QStateMachine::finished, &emitter.thread, &QThread::quit);
+    QSignalSpy signalSpy(&machine, &QStateMachine::finished);
+    QTRY_COMPARE_WITH_TIMEOUT(signalSpy.count(), 1, 100);
+}
+
 QTEST_MAIN(tst_QStateMachine)
 #include "tst_qstatemachine.moc"