diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-09-09 13:09:44 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2019-09-12 10:12:26 +0200 |
| commit | 5cfa917baf416f6234bd99e51f05514b1859e2fe (patch) | |
| tree | 638e7bfd54f89fe41f49d22762be5dfa940fe724 | |
| parent | 188cc2019bf19b0a86fc56652fa683226a21dd90 (diff) | |
| download | qttools-5cfa917baf416f6234bd99e51f05514b1859e2fe.tar.gz | |
qdoc: Do not prefix related non-members with a parent scope
The fact that a related non-member has a parent-child relationship
with the node it relates to is simply an implementation detail in
QDoc - it should not be visible in the generated output.
The same applies for proxy nodes - i.e. aggregates that hold
children documented in another module.
Fixes: QTBUG-77960
Change-Id: I8d83ee7022d5f15af720cbd65c138be0469d39a0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/qdoc/cppcodemarker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index b1c7b1489..63969426c 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -130,8 +130,13 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, name = "<@name>" + name + "</@name>"; if (style == Section::Details) { - if (!node->parent()->name().isEmpty() && !node->parent()->isHeader() && - !node->isProperty() && !node->isQmlNode() && !node->isJsNode()) + if (!node->isRelatedNonmember() && + !node->isProxyNode() && + !node->parent()->name().isEmpty() && + !node->parent()->isHeader() && + !node->isProperty() && + !node->isQmlNode() && + !node->isJsNode()) name.prepend(taggedNode(node->parent()) + "::"); } |