diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:55 +0200 |
| commit | ba2b7b8e33635f29bae8e9e580b23a544de7727f (patch) | |
| tree | 15514c09367f27944bd8a9198217639846e1a4b5 /src/corelib/kernel/qabstracteventdispatcher.h | |
| parent | aadc294f2dd1c7e94a997f5797bc83b34d2c59ff (diff) | |
| parent | 43ea15d01cd491639d8cb5eb85da066f5d0a8571 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib58433da04bffb5dfab5486b80f17f39cc4145fa
Diffstat (limited to 'src/corelib/kernel/qabstracteventdispatcher.h')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 4775d3d47a..bd8da5c35d 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -87,6 +87,7 @@ public: QT_DEPRECATED inline void registerTimer(int timerId, int interval, QObject *object) { registerTimer(timerId, interval, Qt::CoarseTimer, object); } #endif + // ### Qt6: change interval range to qint64 (or use QDeadlineTimer) int registerTimer(int interval, Qt::TimerType timerType, QObject *object); virtual void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) = 0; virtual bool unregisterTimer(int timerId) = 0; |