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/node.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/node.cpp')
| -rw-r--r-- | src/qdoc/node.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 5cf323e1c..c1a204c9a 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1334,11 +1334,11 @@ QString Node::fullDocumentName() const if (n->isTextPageNode()) break; - // Examine the parent node if one exists. - if (n->parent()) - n = n->parent(); - else + // Examine the parent if the node is a member + if (!n->parent() || n->isRelatedNonmember()) break; + + n = n->parent(); } while (true); // Create a name based on the type of the ancestor node. |