diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
| commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
| tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /src/tools | |
| parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
| parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 6b0c2dce88..f19f902c6b 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -5900,9 +5900,15 @@ void DitaXmlGenerator::writeDitaMap(const Tree *tree) writeEndTag(); // </topicmeta> writeStartTag(DT_topicref); - xmlWriter().writeAttribute("navtitle",project); - if (rootPageNode) + if (rootPageNode) { + if (!rootPageNode->title().isEmpty()) + xmlWriter().writeAttribute("navtitle",rootPageNode->title()); + else + xmlWriter().writeAttribute("navtitle",project); xmlWriter().writeAttribute("href",fileName(rootPageNode)); + } + else + xmlWriter().writeAttribute("navtitle",project); writeTopicrefs(pageTypeMaps[Node::OverviewPage], "overviews"); writeTopicrefs(pageTypeMaps[Node::HowToPage], "howtos"); |