From 5ec08045837a5c689487b03a828f6ac4923375f6 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 25 Jul 2013 11:38:17 +0200 Subject: [PATCH] qdoc: Don't try to output from index nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Topi Reiniö --- src/tools/qdoc/generator.cpp | 2 ++ src/tools/qdoc/helpprojectwriter.cpp | 5 +++++ 2 files changed, 7 insertions(+) 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(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;