summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-08-19 14:54:51 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-08-20 07:51:05 +0200
commit92d4d490fe808479e3fe8885e5e5cabd20f3d03f (patch)
treebed5c974344f0baac00265c48f4d674ad185e557 /src/corelib/tools
parent1f1f0003274e446fc49e61255749f83c5826cd0b (diff)
Fix a number of qdoc warnings
- Remove obsolete functions and enumeration values - Remove QObject * parameter from QMetaProperty accessors - Fix renamed enumerations in QSsl - Fix list items to be \li - Fix function signatures and variable names Change-Id: I37c7e6bf2c8ff92bc7b82620bae0a27796f866ab Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qiterator.qdoc16
-rw-r--r--src/corelib/tools/qmargins.cpp2
2 files changed, 1 insertions, 17 deletions
diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc
index 49ee9ef00c..2c07dcf423 100644
--- a/src/corelib/tools/qiterator.qdoc
+++ b/src/corelib/tools/qiterator.qdoc
@@ -210,14 +210,6 @@
*/
/*!
- \class QVectorIterator
- \inmodule QtCore
- \brief QVectorIterator is an alias for QListIterator.
-
- Please see the QListIterator documentation for details.
-*/
-
-/*!
\class QSetIterator
\inmodule QtCore
\brief The QSetIterator class provides a Java-style const iterator for QSet.
@@ -331,14 +323,6 @@
*/
/*!
- \class QMutableVectorIterator
- \inmodule QtCore
- \brief QMutableVectorIterator is an alias for QMutableListIterator.
-
- Please see the QMutableListIterator documentation for details.
-*/
-
-/*!
\class QMutableSetIterator
\inmodule QtCore
\since 4.2
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index 2d7816e217..d914124280 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -663,7 +663,7 @@ QDebug operator<<(QDebug dbg, const QMargins &m)
*/
/*!
- \fn QMargins operator|(const QMargins &m1, const QMargins &m2)
+ \fn QMarginsF operator|(const QMarginsF &m1, const QMarginsF &m2)
\relates QMarginsF
\overload