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

1 files changed, 27 insertions, 0 deletions

diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp
index b355ca605f..5b883a05da 100644
--- a/src/corelib/thread/qrunnable.cpp
+++ b/src/corelib/thread/qrunnable.cpp
@@ -113,4 +113,31 @@ QRunnable::~QRunnable()
     \sa autoDelete(), QThreadPool
 */
 
+class FunctionRunnable : public QRunnable
+{
+    std::function<void()> m_functor;
+public:
+    FunctionRunnable(std::function<void()> functor) : m_functor(std::move(functor))
+    {
+    }
+    void run() override
+    {
+        m_functor();
+    }
+};
+
+/*!
+    \since 5.15
+
+    Creates a QRunnable that calls \a fun in run().
+
+    Auto-deletion is enabled by default.
+
+    \sa run(), autoDelete()
+*/
+QRunnable *QRunnable::create(std::function<void()> fun)
+{
+    return new FunctionRunnable(std::move(fun));
+}
+
 QT_END_NAMESPACE