diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
| commit | 37d3bc9ad7731a131485a9be1ae5b5aac430f82e (patch) | |
| tree | 2456b1d9bb5050bd5c871c62d0a2d362a1a003c7 /src/gui/text/qtextdocument.cpp | |
| parent | 1983abddc06350541ac7a4bb4b2da14091e96311 (diff) | |
| parent | 900b57ea90ebe60414a5188337bc85ee4faac220 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ic1dd39044e19f50e1068d4ac70dacaad6440e570
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 008f695da0..4f187c6701 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -155,7 +155,7 @@ bool Qt::mightBeRichText(const QString& text) This function is defined in the \c <QTextDocument> header file. - \sa escape(), mightBeRichText() + \sa QString::toHtmlEscaped(), mightBeRichText() */ QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode) { |