1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add virtual stub to QAbstractEventDispatcherV2

Browse Source 
To be implemented in 6.9, but added here to avoid a
QAbstractEventDispatcherV3.

Change-Id: If8bd98f6299e39999d09b2c8857565d5fd890eec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 404ad4e17d9d36566881e0f398e24ccbc2af4a72)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Allan Sandfeld Jensen 2024-07-15 15:47:20 +02:00 committed by Qt Cherry-pick Bot
parent c359af7bfb
commit 646fb238e7
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qabstracteventdispatcher.cpp
View File

@ -702,6 +702,16 @@ int QAbstractEventDispatcherV2::remainingTime(int timerId)
auto self = static_cast<QAbstractEventDispatcherV2 *>(this); auto self = static_cast<QAbstractEventDispatcherV2 *>(this);
return fromDuration<int>(self->remainingTime(Qt::TimerId(timerId))); return fromDuration<int>(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 #endif // ! Qt 7
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/corelib/kernel/qabstracteventdispatcher.h
View File

@ -108,6 +108,7 @@ public:
virtual bool unregisterTimer(Qt::TimerId timerId) = 0; virtual bool unregisterTimer(Qt::TimerId timerId) = 0;
virtual QList<TimerInfoV2> timersForObject(QObject *object) const = 0; virtual QList<TimerInfoV2> timersForObject(QObject *object) const = 0;
virtual Duration remainingTime(Qt::TimerId timerId) const = 0; virtual Duration remainingTime(Qt::TimerId timerId) const = 0;
virtual bool processEventsWithDeadline(QEventLoop::ProcessEventsFlags flags, QDeadlineTimer deadline); // reserved for 6.9
protected: protected:
QAbstractEventDispatcherV2(QAbstractEventDispatcherPrivate &, QObject *parent); QAbstractEventDispatcherV2(QAbstractEventDispatcherPrivate &, QObject *parent);