summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qtimer.cpp
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2024-07-31 17:31:16 +0200
committerAndre Hartmann <aha_1980@gmx.de>2024-08-09 18:28:32 +0200
commitea0f8cee55e56d0f03ea9a185faee328b5cfa7bf (patch)
tree02f64d8d070b0bedd338af01f038256125098eb9 /src/corelib/kernel/qtimer.cpp
parentd9346c96104f9d83dad2d29a945f7ac96ab9258d (diff)
Doc: Clarify setInterval() and start() for active timer
Despite using different code paths, both stop and then re-start an already active timer, which invalidates the id(). While at it, port the occurrences of timerId() to the modern function id(), which exists in both QTimer and QChronoTimer Pick-to: 6.8 Change-Id: I5db099b198b1c11e1cdbd0fbb30ecece5d0135c8 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/kernel/qtimer.cpp')
-rw-r--r--src/corelib/kernel/qtimer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index f2311363781..c51988970be 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -204,7 +204,7 @@ Qt::TimerId QTimer::id() const
//! [stop-restart-timer]
If the timer is already running, it will be
- \l{QTimer::stop()}{stopped} and restarted.
+ \l{QTimer::stop()}{stopped} and restarted. This will also change its id().
//! [stop-restart-timer]
//! [singleshot-activation]
@@ -591,7 +591,9 @@ QBindable<bool> QTimer::bindableSingleShot()
interval of 0 will time out as soon as all the events in the window
system's event queue have been processed.
- Setting the interval of an active timer changes its timerId().
+ Setting the interval of an active timer will change the interval,
+ stop() and then start() the timer, and acquire a new id().
+ If the timer is not active, only the interval is changed.
\sa singleShot
*/