QDoc: Introduce a setting to include index nodes in QHP.

Change-Id: I5d35961241300f509b8a9d8e3cf980fabc10cfab
Reviewed-by: Martin Smith <martin.smith@nokia.com>

diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index 48ecdfb..5e8c6d8 100644 (file)
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -77,6 +77,7 @@ HelpProjectWriter::HelpProjectWriter(const Config &config,
         project.indexTitle = config.getString(prefix + "indexTitle");
         project.indexRoot = config.getString(prefix + "indexRoot");
         project.filterAttributes = config.getStringList(prefix + "filterAttributes").toSet();
+        project.includeIndexNodes = config.getBool(prefix + "includeIndexNodes");
         QSet<QString> customFilterNames = config.subVars(prefix + "customFilters");
         foreach (const QString &filterName, customFilterNames) {
             QString name = config.getString(prefix + "customFilters" + Config::dot + filterName + Config::dot + "name");
@@ -222,7 +223,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                                         QXmlStreamWriter & /* writer */,
                                         const Node *node)
 {
-    if (!node->url().isEmpty())
+    if (!node->url().isEmpty() && !(project.includeIndexNodes && !node->url().startsWith("http")))
         return false;
 
     if (node->access() == Node::Private || node->status() == Node::Internal)

diff --git a/src/tools/qdoc/helpprojectwriter.h b/src/tools/qdoc/helpprojectwriter.h
index 84f6385..d9be950 100644 (file)
--- a/src/tools/qdoc/helpprojectwriter.h
+++ b/src/tools/qdoc/helpprojectwriter.h
@@ -81,6 +81,7 @@ struct HelpProject
     QSet<QString> excluded;
     QMap<QString, SubProject> subprojects;
     QHash<const Node *, QSet<Node::Status> > memberStatus;
+    bool includeIndexNodes;
 };
 
 class HelpProjectWriter