AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDoc: Edited title generation for QML and C++ API pages

Browse Source 
-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:
1243940f83
8e5e9d7987
This commit restores the changes while ammending similar fixes

Change-Id: I996b18f020b392aceeb40da7797838aca4a0626f
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Jerome Pasion 2014-07-08 16:02:57 +02:00
parent c10ba1ada0
commit c05fd55b96
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/qdoc/htmlgenerator.cpp
View File

@ -1334,14 +1334,13 @@ void HtmlGenerator::generateQmlTypePage(QmlClassNode* qcn, CodeMarker* marker)
{ {
SubTitleSize subTitleSize = LargeSubTitle; SubTitleSize subTitleSize = LargeSubTitle;
QList<Section>::const_iterator s; QList<Section>::const_iterator s;
QString fullTitle = qcn->fullTitle(); QString htmlTitle = qcn->fullTitle() + " QML Type";
QString htmlTitle = fullTitle;
generateHeader(htmlTitle, qcn, marker); generateHeader(htmlTitle, qcn, marker);
QList<Section> sections = marker->qmlSections(qcn, CodeMarker::Summary); QList<Section> sections = marker->qmlSections(qcn, CodeMarker::Summary);
generateTableOfContents(qcn, marker, &sections); generateTableOfContents(qcn, marker, &sections);
marker = CodeMarker::markerForLanguage(QLatin1String("QML")); marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
generateTitle(fullTitle, Text() << qcn->subTitle(), subTitleSize, qcn, marker); generateTitle(htmlTitle, Text() << qcn->subTitle(), subTitleSize, qcn, marker);
generateBrief(qcn, marker); generateBrief(qcn, marker);
generateQmlRequisites(qcn, marker); generateQmlRequisites(qcn, marker);
@ -1396,13 +1395,12 @@ void HtmlGenerator::generateQmlBasicTypePage(QmlBasicTypeNode* qbtn, CodeMarker*
{ {
SubTitleSize subTitleSize = LargeSubTitle; SubTitleSize subTitleSize = LargeSubTitle;
QList<Section>::const_iterator s; QList<Section>::const_iterator s;
QString htmlTitle = qbtn->fullTitle(); QString htmlTitle = qbtn->fullTitle() + " QML Basic Type";
QString fullTitle = "QML Basic Type: " + htmlTitle;
marker = CodeMarker::markerForLanguage(QLatin1String("QML")); marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
generateHeader(htmlTitle, qbtn, marker); generateHeader(htmlTitle, qbtn, marker);
generateTitle(fullTitle, generateTitle(htmlTitle,
Text() << qbtn->subTitle(), Text() << qbtn->subTitle(),
subTitleSize, subTitleSize,
qbtn, qbtn,
@ -1639,9 +1637,8 @@ void HtmlGenerator::generateCollectionNode(CollectionNode* cn, CodeMarker* marke
QList<Section> sections; QList<Section> sections;
QList<Section>::const_iterator s; QList<Section>::const_iterator s;
QString fullTitle = cn->fullTitle(); QString fullTitle = cn->fullTitle();
QString htmlTitle = fullTitle;
generateHeader(htmlTitle, cn, marker); generateHeader(fullTitle, cn, marker);
generateTableOfContents(cn,marker,0); generateTableOfContents(cn,marker,0);
generateTitle(fullTitle, Text() << cn->subTitle(), subTitleSize, cn, marker); generateTitle(fullTitle, Text() << cn->subTitle(), subTitleSize, cn, marker);