Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

2 files changed, 31 insertions, 0 deletions

diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index fb551d5197..c1fa700959 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -3185,6 +3185,26 @@ QStateMachine::WrappedEvent::~WrappedEvent()
   \sa QStateMachine::running
 */
 
+/*!
+  \fn QStateMachine::postDelayedEvent(QEvent *event, std::chrono::milliseconds delay)
+  \since 5.15
+  \overload
+  \threadsafe
+
+  Posts the given \a event for processing by this state machine, with the
+  given \a delay in milliseconds. Returns an identifier associated with the
+  delayed event, or -1 if the event could not be posted.
+
+  This function returns immediately. When the delay has expired, the event
+  will be added to the state machine's event queue for processing. The state
+  machine takes ownership of the event and deletes it once it has been
+  processed.
+
+  You can only post events when the state machine is running.
+
+  \sa cancelDelayedEvent(), postEvent()
+*/
+
 QT_END_NAMESPACE
 
 #include "qstatemachine.moc"
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index 07781d09a4..b3c87a959b 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -48,6 +48,10 @@
 #include <QtCore/qset.h>
 #include <QtCore/qvariant.h>
 
+#if __has_include(<chrono>)
+#    include <chrono>
+#endif
+
 QT_REQUIRE_CONFIG(statemachine);
 
 QT_BEGIN_NAMESPACE
@@ -145,6 +149,13 @@ public:
     bool eventFilter(QObject *watched, QEvent *event) override;
 #endif
 
+#if __has_include(<chrono>) || defined(Q_QDOC)
+    int postDelayedEvent(QEvent *event, std::chrono::milliseconds delay)
+    {
+        return postDelayedEvent(event, int(delay.count()));
+    }
+#endif
+
 public Q_SLOTS:
     void start();
     void stop();