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

Q{Chrono,}Timer: de-duplicate API docs

Browse Source 
Change-Id: Ib88d89e5f8dae4a834467c05e2e5fa6983e7cd76
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 46b8da642b9016c84d0cba12dab9bae3fba24ae4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2024-08-03 03:46:21 +03:00 committed by Qt Cherry-pick Bot
parent 32b0ff2124
commit 9c64b6a201
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qchronotimer.cpp
View File

@ -181,8 +181,10 @@ Qt::TimerId QChronoTimer::id() const
Starts or restarts the timer with the timeout specified in \l interval. Starts or restarts the timer with the timeout specified in \l interval.
//! [stop-restart-timer]
If the timer is already running, it will be If the timer is already running, it will be
\l{QChronoTimer::stop()}{stopped} and restarted. \l{QChronoTimer::stop()}{stopped} and restarted.
//! [stop-restart-timer]
If \l singleShot is true, the timer will be activated only once. If \l singleShot is true, the timer will be activated only once.
*/ */

18
src/corelib/kernel/qtimer.cpp
View File

@ -202,10 +202,14 @@ Qt::TimerId QTimer::id() const
Starts or restarts the timer with the timeout specified in \l interval. Starts or restarts the timer with the timeout specified in \l interval.
//! [stop-restart-timer]
If the timer is already running, it will be If the timer is already running, it will be
\l{QTimer::stop()}{stopped} and restarted. \l{QTimer::stop()}{stopped} and restarted.
//! [stop-restart-timer]
//! [singleshot-activation]
If \l singleShot is true, the timer will be activated only once. If \l singleShot is true, the timer will be activated only once.
//! [singleshot-activation]
*/ */
void QTimer::start() void QTimer::start()
{ {
@ -224,11 +228,10 @@ void QTimer::start()
Starts or restarts the timer with a timeout interval of \a msec Starts or restarts the timer with a timeout interval of \a msec
milliseconds. milliseconds.
If the timer is already running, it will be \include qtimer.cpp stop-restart-timer
\l{QTimer::stop()}{stopped} and restarted.
If \l singleShot is true, the timer will be activated only once. This is \include qtimer.cpp singleshot-activation
equivalent to: This is equivalent to:
\code \code
timer.setInterval(msec); timer.setInterval(msec);
@ -521,11 +524,10 @@ void QTimer::singleShot(std::chrono::milliseconds msec, Qt::TimerType timerType,
Starts or restarts the timer with a timeout of duration \a msec milliseconds. Starts or restarts the timer with a timeout of duration \a msec milliseconds.
If the timer is already running, it will be \include qtimer.cpp stop-restart-timer
\l{QTimer::stop()}{stopped} and restarted.
If \l singleShot is true, the timer will be activated only once. This is \include qtimer.cpp singleshot-activation
equivalent to: This is equivalent to:
\code \code
timer.setInterval(msec); timer.setInterval(msec);