summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-21 23:55:58 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-09-22 06:01:02 +0200
commit1e2325f0dc39df3c91b7d74c7837961a0e12884e (patch)
treeafa2f73d70c14c0e7744af7daac15411163a285a /src
parent19da4897afc6338d8ea6711d3e2b26afc3d3b3e3 (diff)
Fix some qdoc warnings: typos and qdoc syntax
Change-Id: Idf5c1490330e0f2e5d4bcf920eb03fc9993b3c8a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qvariant.cpp6
-rw-r--r--src/corelib/tools/qmargins.cpp4
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp2
-rw-r--r--src/widgets/kernel/qapplication.cpp2
4 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index efc90595bf..e36e926e7b 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2118,7 +2118,7 @@ bool QVariant::view(int type, void *ptr)
\li If one type is numeric and the other one a QString, Qt will try to
convert the QString to a matching numeric type and if successful compare
those.
- \i If both variants contain pointers to QObject derived types, QVariant
+ \li If both variants contain pointers to QObject derived types, QVariant
will check whether the types are related and point to the same object.
\endlist
*/
@@ -2700,7 +2700,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
\class QVariantConstPointer
\since 6.0
\inmodule QtCore
- \brief Emulated const pointer to QVariant based on a pointer
+ \brief Emulated const pointer to QVariant based on a pointer.
QVariantConstPointer wraps a QVariant and returns it from its operator*().
This makes it suitable as replacement for an actual const pointer. We cannot
@@ -2737,7 +2737,7 @@ const QVariant *QVariantConstPointer::operator->() const
\class QVariantPointer
\since 6.0
\inmodule QtCore
- \brief Emulated pointer to QVariant based on a pointer
+ \brief Emulated pointer to QVariant based on a pointer.
QVariantConstPointer wraps a pointer and returns QVariantRef to it from its
operator*(). This makes it suitable as replacement for an actual pointer. We
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index d914124280..a238032f65 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -315,7 +315,7 @@ QT_BEGIN_NAMESPACE
\relates QMargins
Returns a QMargins object that is formed from the maximum of each
- component of \a m2 and a m1.
+ component of \a m2 and \a m1.
\sa QMargins::operator+=(), QMargins::operator-=()
@@ -668,7 +668,7 @@ QDebug operator<<(QDebug dbg, const QMargins &m)
\overload
Returns a QMarginsF object that is formed from the maximum of each
- component of \a m2 and a m1.
+ component of \a m2 and \a m1.
\sa QMarginsF::operator+=(), QMarginsF::operator-=()
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 6cfcce04bf..7da812f64d 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -633,7 +633,7 @@ void QWindowSystemInterface::registerInputDevice(const QInputDevice *device)
/*!
\internal
Convert a list of \l QWindowSystemInterface::TouchPoint \a points to a list
- of \em temporary QEventPoint instances, scaled (but not localized)
+ of \e temporary QEventPoint instances, scaled (but not localized)
for delivery to the given \a window.
This is called from QWindowSystemInterface::handleTouchEvent():
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index c230a71550..c19fa2cd66 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -528,8 +528,6 @@ void qt_init_tooltip_palette()
extern void qRegisterWidgetsVariant();
/*!
- \fn void QApplicationPrivate::initialize()
-
Initializes the QApplication object, called from the constructors.
*/
void QApplicationPrivate::initialize()