summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-01-05 15:55:19 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-05 19:24:58 +0000
commitab7537e384041bce22aac28821b48fe5d6c867f1 (patch)
treefb3bdcd3b0e24bad74f392a67795254dc848e05c
parent33693a928986006d79c1ee743733cde5966ac402 (diff)
downloadqttools-ab7537e384041bce22aac28821b48fe5d6c867f1.tar.gz
qdoc: Fix breadcrumb generation for normal page nodes
If a \page uses a single \ingroup command and a matching \group exists, QDoc is supposed to add a link to that group in the navigation bar (breadcrumbs) for that \page. This was broken as a result of a changed inheritance structure of nodes. Fixes: QTBUG-89835 Change-Id: I915d7ae41866fa89fcd0b133b4827f2e3d55bd54 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 228be3bd697a70a31c26c26d6d21d7bd0aebceda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/htmlgenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 24735237a..4fbc04c92 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1778,8 +1778,8 @@ void HtmlGenerator::generateNavigationBar(const QString &title, const Node *node
<< Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK) << Atom(itemRight)
<< Atom(itemLeft) << Atom(Atom::String, title) << Atom(itemRight);
} else {
- if (node->isAggregate()) {
- QStringList groups = static_cast<const Aggregate *>(node)->groupNames();
+ if (node->isPageNode()) {
+ QStringList groups = static_cast<const PageNode *>(node)->groupNames();
if (groups.length() == 1) {
const Node *groupNode =
qdb_->findNodeByNameAndType(QStringList(groups[0]), &Node::isGroup);