From 646fb238e7599d58fcb650edc97ee32e4872e249 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 15 Jul 2024 15:47:20 +0200 Subject: [PATCH] Add virtual stub to QAbstractEventDispatcherV2 To be implemented in 6.9, but added here to avoid a QAbstractEventDispatcherV3. Change-Id: If8bd98f6299e39999d09b2c8857565d5fd890eec Reviewed-by: Thiago Macieira (cherry picked from commit 404ad4e17d9d36566881e0f398e24ccbc2af4a72) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qabstracteventdispatcher.cpp | 10 ++++++++++ src/corelib/kernel/qabstracteventdispatcher.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index f3056a399ca..b6619d3c4d2 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -702,6 +702,16 @@ int QAbstractEventDispatcherV2::remainingTime(int timerId) auto self = static_cast(this); return fromDuration(self->remainingTime(Qt::TimerId(timerId))); } + +/*! + \internal + Temporary compatibility override. +*/ +bool QAbstractEventDispatcherV2::processEventsWithDeadline(QEventLoop::ProcessEventsFlags flags, QDeadlineTimer deadline) +{ + Q_UNUSED(deadline); + return processEvents(flags); +} #endif // ! Qt 7 QT_END_NAMESPACE diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 418e674954e..54d8406dcfc 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -108,6 +108,7 @@ public: virtual bool unregisterTimer(Qt::TimerId timerId) = 0; virtual QList timersForObject(QObject *object) const = 0; virtual Duration remainingTime(Qt::TimerId timerId) const = 0; + virtual bool processEventsWithDeadline(QEventLoop::ProcessEventsFlags flags, QDeadlineTimer deadline); // reserved for 6.9 protected: QAbstractEventDispatcherV2(QAbstractEventDispatcherPrivate &, QObject *parent);