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:05:55 +0000 |
| commit | dcd5df5823d61e3ad479f259dfd4a25d67a54e4a (patch) | |
| tree | e9f47da9963fbc60dba4a46eccf21c425c6f4bef /src/qdoc/cppcodemarker.cpp | |
| parent | 0407495a027b8e662c773eafb50ab66fd4638962 (diff) | |
| parent | c8e79294237260d735324663932a676d8084efcb (diff) | |
| download | qttools-dcd5df5823d61e3ad479f259dfd4a25d67a54e4a.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5c06b3e0177fcccd988620ab269f75632689a54c
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()) + "::"); } |