diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-03-11 12:16:51 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-03-11 19:44:45 +0100 |
| commit | 04835f562c6d10f35f92afb19564f9612fd2b6cd (patch) | |
| tree | 5f725d1bdcd1c5ba351a5f801bb1c4376d5203f9 | |
| parent | c0124a943b2afdc99f717fc9a8f70b0ed998e087 (diff) | |
QDoc: Remove \contentspage code
The \contentspage command has been unused since Qt 5.3, and
the documentation was removed in 5.15. Remove the related
code.
[ChangeLog][qdoc] - The \contentspage command is removed.
Fixes: QTBUG-75170
Change-Id: I47c7e5c35154ed0d16f7a4584015b4a338735bbe
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/qdoc/codeparser.h | 1 | ||||
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h index 7ae34df1d..163a2c226 100644 --- a/src/qdoc/codeparser.h +++ b/src/qdoc/codeparser.h @@ -93,7 +93,6 @@ private: #define COMMAND_CATEGORY Doc::alias(QLatin1String("category")) #define COMMAND_CLASS Doc::alias(QLatin1String("class")) #define COMMAND_COMPONENT Doc::alias(QLatin1String("component")) -#define COMMAND_CONTENTSPAGE Doc::alias(QLatin1String("contentspage")) #define COMMAND_COPYRHOLDER Doc::alias(QLatin1String("copyrholder")) #define COMMAND_COPYRYEAR Doc::alias(QLatin1String("copyryear")) #define COMMAND_DEPRECATED Doc::alias(QLatin1String("deprecated")) // ### don't document diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 647631c27..daf09023f 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -80,7 +80,7 @@ CppCodeParser::CppCodeParser() } if (metaCommands_.isEmpty()) { metaCommands_ = commonMetaCommands(); - metaCommands_ << COMMAND_CONTENTSPAGE << COMMAND_INHEADERFILE << COMMAND_NEXTPAGE + metaCommands_ << COMMAND_INHEADERFILE << COMMAND_NEXTPAGE << COMMAND_OVERLOAD << COMMAND_PREVIOUSPAGE << COMMAND_QMLINSTANTIATES << COMMAND_REIMP << COMMAND_RELATES; } @@ -559,9 +559,6 @@ void CppCodeParser::processMetaCommand(const Doc &doc, const QString &command, } } } - } else if (command == COMMAND_CONTENTSPAGE) { - qCWarning(lcQdoc, "(qdoc) The \\contentspage command is obsolete and should not be used."); - setLink(node, Node::ContentsLink, arg); } else if (command == COMMAND_NEXTPAGE) { setLink(node, Node::NextLink, arg); } else if (command == COMMAND_PREVIOUSPAGE) { |