diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-07-25 13:44:40 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 13:50:58 +0200 |
commit | 95191658d0b71017c8fcb19058ed900e97d8f81c (patch) | |
tree | e4328b0a5d787114872146ee8bf3d28fd83c6c2d /src | |
parent | bb19bd3b612bfb82a4d42b5ec085185c05ae4f72 (diff) |
QDoc: Introduce a setting to include index nodes in QHP.
Change-Id: I5d35961241300f509b8a9d8e3cf980fabc10cfab
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 3 | ||||
-rw-r--r-- | src/tools/qdoc/helpprojectwriter.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 48ecdfb1b8..5e8c6d8fbb 100644 --- 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 84f6385478..d9be950970 100644 --- 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 |