From d28e2e225c140d4bcae5baabb768683fd5f9a692 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 22 Aug 2014 13:33:51 +0200 Subject: qdoc: Restore navigation bar title for module pages and groups Adapt the code that generates the navigation bar to the recent changes in node hierarchy - Module pages, QML module pages and groups are no longer DocNodes. This change will ensure that if a page has a title, it will be visible in the navigation bar regardless of the the page (node) type. Change-Id: I697a12d5904d88f91771764ab7ed607b79e4eab1 Reviewed-by: Martin Smith --- src/tools/qdoc/htmlgenerator.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/tools') diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index d1ee222148..ae8206b8c3 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1680,13 +1680,12 @@ void HtmlGenerator::generateNavigationBar(const QString &title, << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK) << Atom(Atom::ListItemRight); } - else if (node->isDocNode()) { - const DocNode *dn = static_cast(node); - if (dn && dn->isExampleFile()) { + else { + if (node->isExampleFile()) { navigationbar << Atom(Atom::ListItemLeft) - << Atom(Atom::Link, dn->parent()->name()) + << Atom(Atom::Link, node->parent()->name()) << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK) - << Atom(Atom::String, dn->parent()->title()) + << Atom(Atom::String, node->parent()->title()) << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK) << Atom(Atom::ListItemRight); -- cgit v1.2.3