diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-08-22 13:33:51 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2014-08-26 20:08:40 +0200 |
| commit | d28e2e225c140d4bcae5baabb768683fd5f9a692 (patch) | |
| tree | 2d912361f3c2a2a9fd67e3c976b500db22a3399d /src/tools | |
| parent | f286e0813be5eca789398d3cfcf657a5485d1acf (diff) | |
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 <martin.smith@digia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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<const DocNode *>(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); |