diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qdoc/qdocdatabase.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp index 6312deacbf..acd11ff20b 100644 --- a/src/tools/qdoc/qdocdatabase.cpp +++ b/src/tools/qdoc/qdocdatabase.cpp @@ -1296,6 +1296,8 @@ void QDocDatabase::resolveIssues() { QDocIndexFiles::qdocIndexFiles()->resolveRelates(); QDocIndexFiles::destroyQDocIndexFiles(); } + if (Generator::generating()) + resolveNamespaces(); } void QDocDatabase::resolveStuff() @@ -1326,8 +1328,10 @@ void QDocDatabase::resolveNamespaces() int count = nmm_.remove(s); if (count > 1) { foreach (Node* n, nodes) { - if (n->isNamespace() && n->wasSeen()) { + // Treat public namespaces from index trees as 'seen' + if (n->isNamespace() && (n->wasSeen() || (n->isIndexNode() && n->access() == Node::Public))) { ns = static_cast<NamespaceNode*>(n); + ns->markSeen(); break; } } |