From c05fd55b96c8c3b765daedba7852bfbd5dc22943 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 8 Jul 2014 16:02:57 +0200 Subject: [PATCH] QDoc: Edited title generation for QML and C++ API pages -added "QML Type" for QML types -reworded basic type pages by adding "QML Basic Type" at the end -streamlined variables in QDoc related to the HTML and page titles. These two changes were implemented in 5.3 branch, but got lost during the merge into dev: 1243940f83a5c04cc0eb64a0d1679dab3b7164f1 8e5e9d7987d0251fa61e24acbf6171879df3ae16 This commit restores the changes while ammending similar fixes Change-Id: I996b18f020b392aceeb40da7797838aca4a0626f Reviewed-by: Martin Smith --- src/tools/qdoc/htmlgenerator.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 59cf538ec8..34f2600118 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1334,14 +1334,13 @@ void HtmlGenerator::generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker) { SubTitleSize subTitleSize = LargeSubTitle; QList
::const_iterator s; - QString fullTitle = qcn->fullTitle(); - QString htmlTitle = fullTitle; + QString htmlTitle = qcn->fullTitle() + " QML Type"; generateHeader(htmlTitle, qcn, marker); QList
sections = marker->qmlSections(qcn, CodeMarker::Summary); generateTableOfContents(qcn, marker, §ions); marker = CodeMarker::markerForLanguage(QLatin1String("QML")); - generateTitle(fullTitle, Text() << qcn->subTitle(), subTitleSize, qcn, marker); + generateTitle(htmlTitle, Text() << qcn->subTitle(), subTitleSize, qcn, marker); generateBrief(qcn, marker); generateQmlRequisites(qcn, marker); @@ -1396,13 +1395,12 @@ void HtmlGenerator::generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker* { SubTitleSize subTitleSize = LargeSubTitle; QList
::const_iterator s; - QString htmlTitle = qbtn->fullTitle(); - QString fullTitle = "QML Basic Type: " + htmlTitle; + QString htmlTitle = qbtn->fullTitle() + " QML Basic Type"; marker = CodeMarker::markerForLanguage(QLatin1String("QML")); generateHeader(htmlTitle, qbtn, marker); - generateTitle(fullTitle, + generateTitle(htmlTitle, Text() << qbtn->subTitle(), subTitleSize, qbtn, @@ -1639,9 +1637,8 @@ void HtmlGenerator::generateCollectionNode(CollectionNode* cn, CodeMarker* marke QList
sections; QList
::const_iterator s; QString fullTitle = cn->fullTitle(); - QString htmlTitle = fullTitle; - generateHeader(htmlTitle, cn, marker); + generateHeader(fullTitle, cn, marker); generateTableOfContents(cn,marker,0); generateTitle(fullTitle, Text() << cn->subTitle(), subTitleSize, cn, marker);