summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2023-05-23 12:45:42 +0000
committerTopi Reiniƶ <topi.reinio@qt.io>2023-06-23 07:08:22 +0000
commit2f283489ef6a2f77c6a5ecc85a4f2c109969d393 (patch)
tree583a2ba0ed3e5ffd1325b9f98d678c1c1be57f6b
parent551cbc5b15b46ca4b298a9dfe946f834e0cd2fed (diff)
Doc: Add \relates command to two global swap() functions
And fix incorrect copy-paste error in QBasicTimer's swap() description, 'string' -> 'timer'. Pick-to: 6.6 Change-Id: I28f5e4d6c8e3b8698ab9b4587d503b06c5628b78 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/corelib/ipc/qtipccommon.cpp13
-rw-r--r--src/corelib/kernel/qbasictimer.cpp10
2 files changed, 19 insertions, 4 deletions
diff --git a/src/corelib/ipc/qtipccommon.cpp b/src/corelib/ipc/qtipccommon.cpp
index 1dcc774c85..be9383f38a 100644
--- a/src/corelib/ipc/qtipccommon.cpp
+++ b/src/corelib/ipc/qtipccommon.cpp
@@ -403,10 +403,17 @@ void QNativeIpcKey::destroy_internal() noexcept
/*!
\fn QNativeIpcKey::swap(QNativeIpcKey &other) noexcept
- \fn swap(QNativeIpcKey &lhs, QNativeIpcKey &rhs) noexcept
- Swaps the native IPC key and type \a other with this object, or \a lhs with
- \a rhs. This operation is very fast and never fails.
+ Swaps the native IPC key and type \a other with this object.
+ This operation is very fast and never fails.
+*/
+
+/*!
+ \fn swap(QNativeIpcKey &value1, QNativeIpcKey &value2) noexcept
+ \relates QNativeIpcKey
+
+ Swaps the native IPC key and type \a value1 with \a value2.
+ This operation is very fast and never fails.
*/
/*!
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index b843ec1ecf..cf9c0bbccd 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -86,10 +86,18 @@ QT_BEGIN_NAMESPACE
/*!
\fn QBasicTimer::swap(QBasicTimer &other)
+ \since 5.14
+
+ Swaps the timer \a other with this timer.
+ This operation is very fast and never fails.
+*/
+
+/*!
\fn swap(QBasicTimer &lhs, QBasicTimer &rhs)
+ \relates QBasicTimer
\since 5.14
- Swaps string \a other with this string, or \a lhs with \a rhs.
+ Swaps the timer \a lhs with \a rhs.
This operation is very fast and never fails.
*/