summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <[email protected]>2021-01-28 09:39:36 +0100
committerNico Vertriest <[email protected]>2021-02-18 07:03:19 +0000
commit27f2ef24cde895da7000773366020ab228abcd5e (patch)
tree5ab96f3168a535169a11018bff64fd9902977666
parentf731802ba82ad260e155783e0427fb3f6ebd99fe (diff)
Doc: Fix documentation warnings qtbase
Task-number: QTBUG-90662 Change-Id: If31847f8f2b8b57a8a8624d0406a030b5752f1c8 Reviewed-by: Paul Wicking <[email protected]>
-rw-r--r--src/corelib/kernel/qproperty.cpp8
-rw-r--r--src/gui/math3d/qmatrix4x4.cpp8
-rw-r--r--src/network/ssl/qsslsocket.cpp2
-rw-r--r--src/sql/doc/src/sql-driver.qdoc15
-rw-r--r--src/testlib/qtestelementattribute.cpp4
5 files changed, 20 insertions, 17 deletions
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index 1a0c70dafbb..bd13642e50b 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -709,7 +709,7 @@ QString QPropertyBindingError::description() const
\fn QUntypedBindable::QUntypedBindable()
Default-constructs a QUntypedBindable. It is in an invalid state.
- \sa isValid()
+ \sa isValid()
*/
/*!
@@ -723,14 +723,14 @@ QString QPropertyBindingError::description() const
*/
/*!
- \fn bool QUntypedBindble::isValid()
+ \fn bool QUntypedBindable::isValid()
Returns true if the QUntypedBindable is valid. Methods called on an invalid
QUntypedBindable generally have no effect, unless otherwise noted.
*/
/*!
- \fn bool QUntypedBindble::isReadOnly()
+ \fn bool QUntypedBindable::isReadOnly()
\since 6.1
Returns true if the QUntypedBindable is read-only.
@@ -767,7 +767,7 @@ QString QPropertyBindingError::description() const
Installs \a f as a change handler. Whenever the underlying property changes, \a f will be called, as
long as the returned \c QPropertyChangeHandler and the property are kept alive.
- \sa template<typename T> QProperty::onValueChanged(), subscribe()
+ \sa onValueChanged(), subscribe()
*/
/*!
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 947af641d1d..76348144ff7 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1923,15 +1923,15 @@ QMatrix4x4 QMatrix4x4::orthonormalInverse() const
Normally the QMatrix4x4 class keeps track of this special type internally
as operations are performed. However, if the matrix is modified
- directly with \l {QMatrix4x4::}{operator()()} or data(), then
- QMatrix4x4 will lose track of the special type and will revert to the
- safest but least efficient operations thereafter.
+ directly with operator()(int, int) or data(), then QMatrix4x4 will
+ lose track of the special type and will revert to the safest but least
+ efficient operations thereafter.
By calling optimize() after directly modifying the matrix,
the programmer can force QMatrix4x4 to recover the special type if
the elements appear to conform to one of the known optimized types.
- \sa {QMatrix4x4::}{operator()()}, data(), translate()
+ \sa operator()(int, int), data(), translate()
*/
void QMatrix4x4::optimize()
{
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 67f9b58c28f..83383db8ca5 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1663,7 +1663,7 @@ QList<QSsl::ImplementedClass> QSslSocket::implementedClasses(const QString &back
/*!
\since 6.1
- Returns true if a class \cl is implemented by the backend named \a backendName. An empty
+ Returns true if a class \a cl is implemented by the backend named \a backendName. An empty
\a backendName is understood as a query about the currently active backend.
\sa implementedClasses()
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index faaf29a76b0..06dd0a13120 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -116,7 +116,7 @@
\target DriverStandalone
\section2 Compile only a specific sql driver
- A typical qt-cmake run (in this case to configure for MySQL) looks like this:
+ A typical \c qt-cmake run (in this case to configure for MySQL) looks like this:
\snippet code/doc_src_sql-driver.qdoc 41
\note As mentioned in \l{#DriverWithQt}{Compile Qt with a specific driver},
@@ -185,7 +185,7 @@
you may need to install a package which is usually called "mysql-devel"
or "mariadb-devel".
- Tell \l qt-cmake where to find the MySQL / MariaDB header files and shared
+ Tell \c qt-cmake where to find the MySQL / MariaDB header files and shared
libraries (here it is assumed that MySQL / MariaDB is installed in
\c{/usr/local}) and build:
@@ -564,13 +564,14 @@
SQLite version 3 is included as a third-party library within Qt.
It can be built by passing the \c{-DFEATURE_system_sqlite=OFF} parameter to the
- qt-cmake command line.
+ \c qt-cmake command line.
If you do not want to use the SQLite library included with Qt, you
- can pass \c{-DFEATURE_system_sqlite=ON} to the qt-cmake command line to use the SQLite
- libraries of the operating system. This is recommended whenever possible,
- as it reduces the installation size and removes one component for which
- you need to track security advisories.
+ can pass \c{-DFEATURE_system_sqlite=ON} to the \c qt-cmake command
+ line to use the SQLite libraries of the operating system. This is
+ recommended whenever possible, as it reduces the installation size
+ and removes one component for which you need to track security
+ advisories.
On Unix and \macos (replace \c $SQLITE with the directory where
SQLite resides):
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 595ecda6cc4..ec47ee19004 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
\value LET_Failure
- \value LET_Error
+ \value LET_Message
\value LET_TestCase
@@ -106,6 +106,8 @@ QT_BEGIN_NAMESPACE
\value LET_Benchmark
\value LET_SystemError
+
+ \value LET_SystemOutput
*/
QTestElementAttribute::QTestElementAttribute() = default;