1 files changed, 34 insertions, 6 deletions

diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h
index 1da1d2336e..ec79c07cd7 100644
--- a/src/corelib/kernel/qeventloop.h
+++ b/src/corelib/kernel/qeventloop.h
@@ -5,15 +5,18 @@
 #define QEVENTLOOP_H
 
 #include <QtCore/qobject.h>
+#include <QtCore/qdeadlinetimer.h>
 
 QT_BEGIN_NAMESPACE
 
+class QEventLoopLocker;
 class QEventLoopPrivate;
 
 class Q_CORE_EXPORT QEventLoop : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QEventLoop)
+    friend class QEventLoopLocker;
 
 public:
     explicit QEventLoop(QObject *parent = nullptr);
@@ -34,6 +37,7 @@ public:
 
     bool processEvents(ProcessEventsFlags flags = AllEvents);
     void processEvents(ProcessEventsFlags flags, int maximumTime);
+    void processEvents(ProcessEventsFlags flags, QDeadlineTimer deadline);
 
     int exec(ProcessEventsFlags flags = AllEvents);
     bool isRunning() const;
@@ -51,17 +55,41 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QEventLoop::ProcessEventsFlags)
 
 class QEventLoopLockerPrivate;
 
-class Q_CORE_EXPORT QEventLoopLocker
+class QEventLoopLocker
 {
 public:
-    QEventLoopLocker();
-    explicit QEventLoopLocker(QEventLoop *loop);
-    explicit QEventLoopLocker(QThread *thread);
-    ~QEventLoopLocker();
+    Q_NODISCARD_CTOR Q_CORE_EXPORT QEventLoopLocker() noexcept;
+    Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QEventLoop *loop) noexcept;
+    Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QThread *thread) noexcept;
+    Q_CORE_EXPORT ~QEventLoopLocker();
+
+    Q_NODISCARD_CTOR QEventLoopLocker(QEventLoopLocker &&other) noexcept
+        : p{std::exchange(other.p, 0)} {}
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QEventLoopLocker)
+
+    void swap(QEventLoopLocker &other) noexcept { std::swap(p, other.p); }
+    friend void swap(QEventLoopLocker &lhs, QEventLoopLocker &rhs) noexcept { lhs.swap(rhs); }
 
 private:
     Q_DISABLE_COPY(QEventLoopLocker)
-    QEventLoopLockerPrivate *d_ptr;
+    friend class QEventLoopLockerPrivate;
+
+    //
+    // Private implementation details.
+    // Do not call from public inline API!
+    //
+    enum class Type : quintptr {
+        EventLoop,
+        Thread,
+        Application,
+    };
+    explicit QEventLoopLocker(void *ptr, Type t) noexcept;
+    quintptr p;
+    static constexpr quintptr TypeMask = 0x3;
+    Type type() const { return Type(p & TypeMask); }
+    void *pointer() const { return reinterpret_cast<void *>(p & ~TypeMask); }
+    template <typename Func>
+    void visit(Func func) const;
 };
 
 QT_END_NAMESPACE