diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2023-03-30 08:34:44 +0000 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2023-04-11 16:16:41 +0000 |
| commit | e57bf78334d5b10f23e37d049a58ef24bb5f51e4 (patch) | |
| tree | e9af8164f90aa5f2f28a78182d83336428cab9ed /src/qdoc/cppcodeparser.cpp | |
| parent | a3379894bba777d4dcc8dd6ced5149533bb127ed (diff) | |
| download | qttools-e57bf78334d5b10f23e37d049a58ef24bb5f51e4.tar.gz | |
Revert "qdoc: Add support for 'category' argument in \generatelist command"
This reverts commit df735050ecd01687f17df8f161c706541319ad05.
While the commit works, it introduces unnecessary complexity to the
processing of the \meta command. The same functionality can be
achieved with the help of a documentation macro.
The commit did contain a bug-fix for the \generatelist command,
which is re-introduced as a separate change.
Pick-to: 6.5
Change-Id: Ie8578baa35cfee210fc52428c610307f51103d22
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 685284c59..9b425114c 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -509,11 +509,8 @@ void CppCodeParser::processMetaCommand(const Doc &doc, const QString &command, if (!argPair.second.isEmpty()) node->setDeprecatedSince(argPair.second); } else if (command == COMMAND_INGROUP || command == COMMAND_INPUBLICGROUP) { - // Use bracketed argument as a prefix; used internally by '\meta category' - if (!argPair.second.isEmpty()) - database->addToGroup(argPair.second + " " + arg, node); - else - database->addToGroup(arg, node); + // Note: \ingroup and \inpublicgroup are the same (and now recognized as such). + database->addToGroup(arg, node); } else if (command == COMMAND_INMODULE) { database->addToModule(arg, node); } else if (command == COMMAND_INQMLMODULE) { |