Merge integration refs/builds/qtci/dev/1618306545

5 files changed, 24 insertions, 18 deletions

diff --git a/src/corelib/io/qlockfile.cpp b/src/corelib/io/qlockfile.cpp
index 9dc0102574..032be3b7a1 100644
--- a/src/corelib/io/qlockfile.cpp
+++ b/src/corelib/io/qlockfile.cpp
@@ -184,14 +184,13 @@ void QLockFile::setStaleLockTime(int staleLockTime)
     \overload
     \since 6.2
 
-    Sets \a staleLockTime to be an interval after which a lock file is considered
-    stale.
+    Sets the interval after which a lock file is considered stale to \a value.
     The default value is 30 seconds.
     If your application typically keeps the file locked for more than 30 seconds
     (for instance while saving megabytes of data for 2 minutes), you should set
     a bigger value using setStaleLockTime().
 
-    The value of \a staleLockTime is used by lock() and tryLock() in order
+    The value of staleLockTime() is used by lock() and tryLock() in order
     to determine when an existing lock file is considered stale, i.e. left over
     by a crashed process. This is useful for the case where the PID got reused
     meanwhile, so one way to detect a stale lock file is by the fact that
@@ -212,7 +211,7 @@ int QLockFile::staleLockTime() const
     return d->staleLockTime;
 }
 
-/*! \fn std::chrono::milliseconds staleLockTimeAsDuration() const
+/*! \fn std::chrono::milliseconds QLockFile::staleLockTimeAsDuration() const
     \overload
     \since 6.2
 
diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index b8ab7c8ffd..b8ea89b8e3 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -307,6 +307,8 @@ void QWindowsPipeReader::startAsyncReadLocked()
 }
 
 /*!
+    \internal
+
     Thread pool callback procedure.
  */
 void QWindowsPipeReader::waitCallback(PTP_CALLBACK_INSTANCE instance, PVOID context,
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp
index d711528c8f..4b075549d0 100644
--- a/src/corelib/io/qwindowspipewriter.cpp
+++ b/src/corelib/io/qwindowspipewriter.cpp
@@ -183,6 +183,7 @@ void QWindowsPipeWriter::startAsyncWriteLocked()
 }
 
 /*!
+    \internal
     Thread pool callback procedure.
  */
 void QWindowsPipeWriter::waitCallback(PTP_CALLBACK_INSTANCE instance, PVOID context,
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 677fc6d6ac..3a0f28f444 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -4767,17 +4767,19 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
 */
 
 /*!
-  \function QtLiterals::operator""_qba(const char *str, size_t size)
+  \fn QtLiterals::operator""_qba(const char *str, size_t size)
 
   \relates QByteArray
   \since 6.2
 
-  Literal operator that creates a QByteArray out of a char string literal \a
-  str. Creating a QByteArray from it is free in this case, and the generated
-  string data is stored in the read-only segment of the compiled object file.
-  Duplicate literals may share the same read-only memory. This functionality is
-  interchangeable with QByteArrayLiteral, but saves typing when many string
-  literals are present in the code.
+  Literal operator that creates a QByteArray out of the first \a size characters
+  in the char string literal \a str.
+
+  The QByteArray is created at compile time, and the generated string data is stored
+  in the read-only segment of the compiled object file. Duplicate literals may share
+  the same read-only memory. This functionality is interchangeable with
+  QByteArrayLiteral, but saves typing when many string literals are present in the
+  code.
 
   The following code creates a QByteArray:
   \code
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 3455daa3ca..a690aac936 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -10506,17 +10506,19 @@ QString QString::toHtmlEscaped() const
 */
 
 /*!
-  \function QtLiterals::operator""_qs(const char16_t *str, size_t size)
+  \fn QtLiterals::operator""_qs(const char16_t *str, size_t size)
 
   \relates QString
   \since 6.2
 
-  Literal operator that creates a QString out of a char16_t string literal \a
-  str. Creating a QString from it is free in this case, and the generated string
-  data is stored in the read-only segment of the compiled object file. Duplicate
-  literals may share the same read-only memory. This functionality is
-  interchangeable with QStringLiteral, but saves typing when many string
-  literals are present in the code.
+  Literal operator that creates a QString out of the first \a size characters in
+  the char16_t string literal \a str.
+
+  The QString is created at compile time, and the generated string data is stored
+  in the read-only segment of the compiled object file. Duplicate literals may
+  share the same read-only memory. This functionality is interchangeable with
+  QStringLiteral, but saves typing when many string literals are present in the
+  code.
 
   The following code creates a QString:
   \code