diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-08-01 00:33:49 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-08-28 11:37:35 +0200 |
| commit | 239982901beaf039c25b264a9c6b63aa6fe70710 (patch) | |
| tree | 8513201e0e2983bb819d99ac2bfaa2a0c7d18d91 /src/gui/text/qtextdocumentfragment.cpp | |
| parent | 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8 (diff) | |
Doc: Fix documentation warnings for Qt GUI
* Drop deprecation warnings for now-dropped items
* Use the 'qt6' define and a new \nothing doc macro to conditionally
document items on Qt 6
* Add a custom module header for docs that pulls in also Vulkan headers
* Add \internal command for internal classes/functions
* Move QtGUI-related code snippets from widgets to gui docs
Change-Id: Ieb386b96631a49568d09059906d307c45c01d93a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocumentfragment.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentfragment.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 4344522a5d..6e7c5f1ed9 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -1257,15 +1257,6 @@ void QTextHtmlImporter::appendBlock(const QTextBlockFormat &format, QTextCharFor #endif // QT_NO_TEXTHTMLPARSER -/*! - \fn QTextDocumentFragment QTextDocumentFragment::fromHtml(const QString &text) - - Returns a QTextDocumentFragment based on the arbitrary piece of - HTML in the given \a text. The formatting is preserved as much as - possible; for example, "<b>bold</b>" will become a document - fragment with the text "bold" with a bold character format. -*/ - #ifndef QT_NO_TEXTHTMLPARSER /*! \fn QTextDocumentFragment QTextDocumentFragment::fromHtml(const QString &text, const QTextDocument *resourceProvider) |