diff options
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index d7a51da952..59adc63c9e 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -136,6 +136,7 @@ void QDocIndexFiles::readIndexFile(const QString& path) QDir installDir(path.section('/', 0, -3) + "/outputdir"); indexUrl = installDir.relativeFilePath(path).section('/', 0, -2); } + project_ = indexElement.attribute("project", QString()); basesList_.clear(); relatedList_.clear(); @@ -459,7 +460,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, else if (status == "obsolete") node->setStatus(Node::Obsolete); else if (status == "deprecated") - node->setStatus(Node::Deprecated); + node->setStatus(Node::Obsolete); else if (status == "preliminary") node->setStatus(Node::Preliminary); else if (status == "commendable") @@ -503,6 +504,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, Doc doc(location, location, " ", emptySet); // placeholder node->setDoc(doc); node->setIndexNodeFlag(); + node->setOutputSubdirectory(project_.toLower()); if (node->isInnerNode()) { InnerNode* inner = static_cast<InnerNode*>(node); @@ -712,7 +714,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer, status = "obsolete"; break; case Node::Deprecated: - status = "deprecated"; + status = "obsolete"; break; case Node::Preliminary: status = "preliminary"; @@ -1203,6 +1205,7 @@ void QDocIndexFiles::generateIndex(const QString& fileName, writer.writeAttribute("url", url); writer.writeAttribute("title", title); writer.writeAttribute("version", qdb_->version()); + writer.writeAttribute("project", g->config()->getString(CONFIG_PROJECT)); generateIndexSections(writer, qdb_->treeRoot(), generateInternalNodes); |