From 239982901beaf039c25b264a9c6b63aa6fe70710 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Sat, 1 Aug 2020 00:33:49 +0200 Subject: 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 --- src/gui/text/qtextdocumentfragment.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/gui/text/qtextdocumentfragment.cpp') 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, "bold" 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) -- cgit v1.2.3