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

Doc: fix warnings from links by fully qualifying the target

Browse Source 
The link to QChronoTimer::singleShot seems to ambiguous for qdoc, as
it's both a property and a method. But linking from startTimer to the
QChronoTimer (and QBasicTimer) class rather than singleShot makes
more sense anyway.

Change-Id: I499b1008b8460d9529b8afd00b5dafbb314ceea1
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 6bbc9c714bf067d33ad2f487c552025aaa7278db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-07-10 12:40:26 +02:00 committed by Qt Cherry-pick Bot
parent f856d1e907
commit 6ff2302a7f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ void QChronoTimer::timerEvent(QTimerEvent *e)
The default value for this property is \c false. The default value for this property is \c false.
\sa interval, singleShot() \sa interval, QChronoTimer::singleShot()
*/ */
void QChronoTimer::setSingleShot(bool singleShot) void QChronoTimer::setSingleShot(bool singleShot)
{ {

5
src/corelib/kernel/qobject.cpp
View File

@ -1811,7 +1811,7 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData
startTimer(std::chrono::milliseconds{interval}, timerType); startTimer(std::chrono::milliseconds{interval}, timerType);
\endcode \endcode
\sa timerEvent(), killTimer(), QChronoTimer::singleShot() \sa timerEvent(), killTimer(), QChronoTimer, QBasicTimer
*/ */
int QObject::startTimer(int interval, Qt::TimerType timerType) int QObject::startTimer(int interval, Qt::TimerType timerType)
@ -1858,8 +1858,6 @@ int QObject::startTimer(int interval, Qt::TimerType timerType)
events. There is also a QBasicTimer class that is more lightweight than events. There is also a QBasicTimer class that is more lightweight than
QChronoTimer but less clumsy than using timer IDs directly. QChronoTimer but less clumsy than using timer IDs directly.
\sa timerEvent(), killTimer(), QChronoTimer::singleShot()
\note Starting from Qt 6.8 the type of \a interval \note Starting from Qt 6.8 the type of \a interval
is \c std::chrono::nanoseconds, prior to that it was \c is \c std::chrono::nanoseconds, prior to that it was \c
std::chrono::milliseconds. This change is backwards compatible with std::chrono::milliseconds. This change is backwards compatible with
@ -1871,6 +1869,7 @@ int QObject::startTimer(int interval, Qt::TimerType timerType)
this method, for example: this method, for example:
\snippet code/src_corelib_kernel_qobject.cpp invalid-timer-id \snippet code/src_corelib_kernel_qobject.cpp invalid-timer-id
\sa timerEvent(), killTimer(), QChronoTimer, QBasicTimer
*/ */
int QObject::startTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType) int QObject::startTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType)
{ {