diff options
author | Martin Smith <martin.smith@digia.com> | 2012-11-27 14:07:27 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 15:54:45 +0100 |
commit | 3e33d29a86a99c4dc068e640b23551a7a6e9ab90 (patch) | |
tree | 0a02df617f904911643c02d53335645cf23594d5 /src/tools/qdoc/codeparser.cpp | |
parent | 11a38b63bd34b632e335a38f2e671bea0d6a9564 (diff) |
qdoc: Listing group members across modules
This is a first attempt at fixing the problem, but
it probably is not the entire solution. The problem
requires adding attributes to the index files and
then reusing them when the index files are read.
The same problem will be affecting the module
lists themselves, but that is not fixed in this
update.
Task-number: QTBUG-28036
Change-Id: I8593d5b9446e51a5204b6c71f8c4f2b63f445972
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools/qdoc/codeparser.cpp')
-rw-r--r-- | src/tools/qdoc/codeparser.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/qdoc/codeparser.cpp b/src/tools/qdoc/codeparser.cpp index ea3bdc25f4..5fb4909f44 100644 --- a/src/tools/qdoc/codeparser.cpp +++ b/src/tools/qdoc/codeparser.cpp @@ -239,11 +239,10 @@ void CodeParser::processCommonMetaCommand(const Location& location, else if (command == COMMAND_DEPRECATED) { node->setStatus(Node::Deprecated); } - else if (command == COMMAND_INGROUP) { - qdb_->addToGroup(node, arg.first); - } - else if (command == COMMAND_INPUBLICGROUP) { - qdb_->addToPublicGroup(node, arg.first); + else if ((command == COMMAND_INGROUP) || (command == COMMAND_INPUBLICGROUP)) { + // Note: \ingroup and \inpublicgroup are now the same. + // Not that they were ever different. + DocNode* dn = qdb_->addToGroup(arg.first, node); } else if (command == COMMAND_INMODULE) { qdb_->addToModule(arg.first,node); |