diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-07-25 11:38:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-25 12:23:22 +0200 |
| commit | 5ec08045837a5c689487b03a828f6ac4923375f6 (patch) | |
| tree | 437197c334ddea661befc3ed7eaac7878f663acf | |
| parent | 97378dc70e3d15dff015c9a16285fcada78375b1 (diff) | |
qdoc: Don't try to output from index nodes
When qdoc traverses its internal node tree to generate
either the html docs or the help file, it no longer
traverses nodes that were added to the tree as the result
of reading an index file.
Task-number: QTBUG-32622
Change-Id: Iac63ac2ce177b15b85a2aa73850c45891cbbc624
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 2 | ||||
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index f9601f8281..d917bc73fc 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -945,6 +945,8 @@ void Generator::generateInnerNode(InnerNode* node) { if (!node->url().isNull()) return; + if (node->isIndexNode()) + return; if (node->type() == Node::Document) { DocNode* docNode = static_cast<DocNode*>(node); diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 9e67007eba..bfa2524a6c 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -422,6 +422,11 @@ bool HelpProjectWriter::generateSection(HelpProject &project, void HelpProjectWriter::generateSections(HelpProject &project, QXmlStreamWriter &writer, const Node *node) { + /* + Don't include index nodes in the help file. Or DITA map nodes. + */ + if (node->isIndexNode() || node->subType() == Node::DitaMap) + return; if (!generateSection(project, writer, node)) return; |