diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-04 22:46:00 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-06 22:03:52 +0100 |
| commit | b284e01b0f4baa40d6c9c910bdd730c1159c8872 (patch) | |
| tree | 247f8e2c3fb57f742b68c1f816f60000af912060 /src/gui/text | |
| parent | b13bad3ab0de96a3c6fe6dce4b9f35649f2f37d9 (diff) | |
Fix a few qdoc warnings
Change-Id: I7cc284ec56f02049d43a23c81659db94bfc3ff42
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qtextformat.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 695a46d050..53344418a0 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1152,8 +1152,8 @@ QFont::Weight QFont::weight() const /*! \obsolete Use setWeight() instead. - Sets the weight of the font to \a weight using the legacy font weight - scale of Qt 5 and previous versions. + Sets the weight of the font to \a legacyWeight using the legacy font + weight scale of Qt 5 and previous versions. Since Qt 6, the OpenType standard's font weight scale is used instead of a non-standard scale. This requires conversion from values that diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index d47bbfc132..1413b1ab29 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -547,7 +547,6 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value BlockFormat The object formats a text block \value CharFormat The object formats a single character \value ListFormat The object formats a list - \omitvalue TableFormat \omit Unused Value, a table's FormatType is FrameFormat. \endomit \value FrameFormat The object formats a frame \value UserFormat @@ -653,6 +652,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value AnchorName \omitvalue OldFontLetterSpacingType \omitvalue OldFontStretch + \omitvalue OldTextUnderlineColor \value ObjectType List properties |