diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2025-07-15 14:33:45 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2025-07-22 07:11:09 +0000 |
| commit | 0e65c2ce665aea78890afe86ad533ce975f01e0a (patch) | |
| tree | 2e0fe2ff887314e99ab5d257fdca5911e30639b7 /src/corelib/kernel/qtimer.cpp | |
| parent | a68e7a5f876f432812e15e287c93c137a2ec1d2a (diff) | |
QTimer: Doc: Move sentences to avoid ambiguities
The old docu could be mis-read as: "When singleShot is true [...]
this is equivalent to calling setInterval(interval) and start()".
But what was really meant is that start(interval) is equivalent to
calling setInterval(interval) and start().
Amends 2c86903704413d869131d5ea81951eb8de51639e
Pick-to: 6.8 6.10
Change-Id: I58d36ba0ed2f32e26618ad3260f9f7684be03db0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qtimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 74d38faa214..1aa8bca83ff 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -223,9 +223,6 @@ void QTimer::start() Starts or restarts the timer with a timeout interval of \a msec milliseconds. - \include qtimer.cpp stop-restart-timer - - \include qtimer.cpp singleshot-activation This is equivalent to: \code @@ -233,6 +230,10 @@ void QTimer::start() timer.start(); \endcode + \include qtimer.cpp stop-restart-timer + + \include qtimer.cpp singleshot-activation + \include timers-common.qdocinc negative-intervals-not-allowed \note Keeping the event loop busy with a zero-timer is bound to @@ -264,9 +265,6 @@ checkInterval(const char *caller, std::chrono::milliseconds interval) Starts or restarts the timer with a timeout of duration \a interval milliseconds. - \include qtimer.cpp stop-restart-timer - - \include qtimer.cpp singleshot-activation This is equivalent to: \code @@ -274,6 +272,10 @@ checkInterval(const char *caller, std::chrono::milliseconds interval) timer.start(); \endcode + \include qtimer.cpp stop-restart-timer + + \include qtimer.cpp singleshot-activation + \include timers-common.qdocinc negative-intervals-not-allowed */ void QTimer::start(std::chrono::milliseconds interval) |