diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-26 14:32:20 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-09-27 10:58:00 +0000 |
| commit | c2aa6d12e22a49167fbf0219df7df6c41f29b8ac (patch) | |
| tree | 284e094c9ac8efd102294d2e6d2a30d85d5817bf /src/qdoc/cppcodemarker.cpp | |
| parent | dd800d1669f49340614ac26dd9a4ef0bcc8f78f1 (diff) | |
| parent | dcd5df5823d61e3ad479f259dfd4a25d67a54e4a (diff) | |
| download | qttools-c2aa6d12e22a49167fbf0219df7df6c41f29b8ac.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
| -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 325130399..26a43794d 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -133,8 +133,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()) + "::"); } |