diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-08-20 18:25:50 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-08-24 23:50:23 +0200 |
| commit | 145940e1ef8fc8334ff4603a44f7896886e646cb (patch) | |
| tree | dd44463eb0a62d3fdc38be2663da7b1a40453596 /src/corelib/text | |
| parent | d9f8b689637aa4559ee57dc80aef0d4325d14e0c (diff) | |
Doc: Fix documentation issues for Qt Core
* Tag deprecated Q(Multi)Map operators in the header to correctly
match them with documentation \fn commands.
* Add documentation for QByteArrayView comparison operators.
* Add a dummy typedef 'jfieldID' for generating docs correctly
on non-Android platforms
* Fix other minor issues
Pick-to: 6.2
Task-number: QTBUG-95860
Change-Id: I141d2f75d6aa10557aa374201f09ad74b4cd6e81
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qbytearrayview.qdoc | 11 | ||||
| -rw-r--r-- | src/corelib/text/qchar.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/corelib/text/qbytearrayview.qdoc b/src/corelib/text/qbytearrayview.qdoc index d52668af9b..5bfd8bdef2 100644 --- a/src/corelib/text/qbytearrayview.qdoc +++ b/src/corelib/text/qbytearrayview.qdoc @@ -353,6 +353,17 @@ \sa data(), begin(), end() */ +/*! //! friend + \fn int QByteArrayView::operator==(QByteArrayView lhs, QByteArrayView rhs) + \fn int QByteArrayView::operator!=(QByteArrayView lhs, QByteArrayView rhs) + \fn int QByteArrayView::operator< (QByteArrayView lhs, QByteArrayView rhs) + \fn int QByteArrayView::operator<=(QByteArrayView lhs, QByteArrayView rhs) + \fn int QByteArrayView::operator> (QByteArrayView lhs, QByteArrayView rhs) + \fn int QByteArrayView::operator>=(QByteArrayView lhs, QByteArrayView rhs) + + Comparison operators for QByteArrayView. +*/ + /*! \fn int QByteArrayView::compare(QByteArrayView bv, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 6.2 diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index d000fe6bf8..c2eaa7bd30 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -499,7 +499,7 @@ QT_BEGIN_NAMESPACE \enum QChar::Decomposition This enum type defines the Unicode decomposition attributes. See - the \l{Unicode Standard} for a description of the values. + the \l{Unicode standard} for a description of the values. \value NoDecomposition \value Canonical @@ -528,7 +528,7 @@ QT_BEGIN_NAMESPACE since 5.3 This enum type defines the Unicode joining type attributes. See the - \l{Unicode Standard} for a description of the values. + \l{Unicode standard} for a description of the values. In order to conform to C/C++ naming conventions "Joining_" is prepended to the codes used in the Unicode Standard. |