Merge integration refs/builds/qtci/dev/1618306545

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
 

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,

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,

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

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

src/gui/image/qpixmap.cpp

@@ -633,7 +633,7 @@ qreal QPixmap::devicePixelRatio() const
     high-DPI pixmap rather than a large pixmap
     (see \l{Drawing High Resolution Versions of Pixmaps and Images}).
 
-    \sa devicePixelRatio(), devicePixelSize()
+    \sa devicePixelRatio(), deviceIndependentSize()
 */
 void QPixmap::setDevicePixelRatio(qreal scaleFactor)
 {

src/network/socket/qlocalsocket.cpp

@@ -454,10 +454,13 @@ QString QLocalSocket::serverName() const
 }
 
 /*!
-    Returns the socket options as specified by setSocketOptions(),
+    \property QLocalSocket::socketOptions
+    \since 6.2
+    \brief the socket options.
+
+    Options must be set while the socket is in \l{UnconnectedState} state.
 
     \sa connectToServer()
-
  */
 QLocalSocket::SocketOptions QLocalSocket::socketOptions() const
 {
@@ -465,12 +468,6 @@ QLocalSocket::SocketOptions QLocalSocket::socketOptions() const
     return d->socketOptions;
 }
 
-/*!
-    \since 6.2
-
-    Set the socket \a options of the connection.
-
-*/
 void QLocalSocket::setSocketOptions(QLocalSocket::SocketOptions option)
 {
     Q_D(QLocalSocket);

src/widgets/itemviews/qtableview.cpp

@@ -2844,7 +2844,7 @@ QRect QTableView::visualRect(const QModelIndex &index) const
 /*!
     \reimp
 
-    Makes sure that the given \a item is visible in the table view,
+    Makes sure that the given \a index is visible in the table view,
     scrolling if necessary.
 */
 void QTableView::scrollTo(const QModelIndex &index, ScrollHint hint)