1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5d35961241300f509b8a9d8e3cf980fabc10cfab
Reviewed-by: Martin Smith <martin.smith@nokia.com>
This commit is contained in:
Casper van Donderen 2012-07-25 13:44:40 +02:00 committed by Qt by Nokia
parent bb19bd3b61
commit 95191658d0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/qdoc/helpprojectwriter.cpp
View File

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

1
src/tools/qdoc/helpprojectwriter.h
View File

@ -81,6 +81,7 @@ struct HelpProject
QSet<QString> excluded; QSet<QString> excluded;
QMap<QString, SubProject> subprojects; QMap<QString, SubProject> subprojects;
QHash<const Node *, QSet<Node::Status> > memberStatus; QHash<const Node *, QSet<Node::Status> > memberStatus;
bool includeIndexNodes;
}; };
class HelpProjectWriter class HelpProjectWriter