summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-07-30 13:38:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-31 10:20:52 +0200
commit1d2941f978bc15d98a166c9a657d50b0227fdf5a (patch)
tree12b07a32d21c2087c49a4b820022b1986bd9ea56 /src/tools
parentd37db713239de1c47b7bf85bc3016708ba3da3ec (diff)
qdoc: Ensure obsolete members file is written
In the case where the only obsolete members of a class were actually non-members but just related functions, the help file writer didn't include a reference to the obsolete members file. This update fixes that bug. Task-number: QTBUG-31379 Change-Id: I065da649bc12e3dcc81244939be0162599d54be9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/helpprojectwriter.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index bfa2524a6c..08690c93d1 100644
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -436,6 +436,9 @@ void HelpProjectWriter::generateSections(HelpProject &project,
// Ensure that we don't visit nodes more than once.
QMap<QString, const Node*> childMap;
foreach (const Node *childNode, inner->childNodes()) {
+ if (childNode->isIndexNode())
+ continue;
+
if (childNode->access() == Node::Private)
continue;
@@ -462,6 +465,10 @@ void HelpProjectWriter::generateSections(HelpProject &project,
else {
// Store member status of children
project.memberStatus[node].insert(childNode->status());
+ if (childNode->relates()) {
+ project.memberStatus[childNode->relates()].insert(childNode->status());
+ project.files.insert(gen_->fullDocumentLocation(childNode->relates(),true));
+ }
if (childNode->type() == Node::Function) {
const FunctionNode *funcNode = static_cast<const FunctionNode *>(childNode);