diff options
| -rw-r--r-- | src/tools/qdoc/main.cpp | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 064617e6f4..e6fdbc8ab6 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -357,8 +357,8 @@ static void processQdocconfFile(const QString &fileName) QSet<QString> outputFormats = config.getOutputFormats(); Location outputFormatsLocation = config.lastLocation(); - if (!Generator::runPrepareOnly()) - loadIndexFiles(config); + //if (!Generator::runPrepareOnly()) + loadIndexFiles(config); QSet<QString> excludedDirs; QSet<QString> excludedFiles; diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index fec4f304e3..a15f0219b5 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -555,7 +555,10 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, Node* node, bool generateInternalNodes) { - if (node->subType() == Node::DitaMap) + /* + Don't include index nodes in a new index file. Or DITA map nodes. + */ + if (node->isIndexNode() || node->subType() == Node::DitaMap) return false; QString nodeName; |