From 2f1d22c8b4033b7160dde08ba232d22a620f8cd7 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Fri, 7 Nov 2014 10:52:34 +0100
Subject: [PATCH] qdoc: Removed text formatting from requisites table
Removed the teletype (code) formatting used in the requisite table:
include, qmake (qtvariable) and import statement (for QML types).
This makes the table look more uniform as it doesn't mix font
styles anymore.
Also, remove the closing </b> tag that caused incorrect html to
be generated.
Change-Id: I180a90c22d4b0066aade8ce38d13343076285ff0
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
src/tools/qdoc/htmlgenerator.cpp | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index bd8d45ab534..0f5bf26e71f 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1898,12 +1898,9 @@ void HtmlGenerator::generateRequisites(InnerNode *inner, CodeMarker *marker)
//add the includes to the map
if (!inner->includes().isEmpty()) {
text.clear();
- text << formattingRightMap()[ATOM_FORMATTING_BOLD]
- << formattingLeftMap()[ATOM_FORMATTING_TELETYPE]
- << highlightedCode(indent(codeIndent,
+ text << highlightedCode(indent(codeIndent,
marker->markedUpIncludes(inner->includes())),
- inner)
- << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
+ inner);
requisites.insert(headerText, text);
}
@@ -1938,9 +1935,7 @@ void HtmlGenerator::generateRequisites(InnerNode *inner, CodeMarker *marker)
ModuleNode* moduleNode = qdb_->findModule(inner->moduleName());
if (moduleNode && !moduleNode->qtVariable().isEmpty()) {
text.clear();
- text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_TELETYPE)
- << "QT += " + moduleNode->qtVariable()
- << Atom(Atom::FormattingRight, ATOM_FORMATTING_TELETYPE);
+ text << "QT += " + moduleNode->qtVariable();
requisites.insert(qtVariableText, text);
}
}
@@ -2053,10 +2048,7 @@ void HtmlGenerator::generateQmlRequisites(QmlClassNode *qcn, CodeMarker *marker)
else
qmlModuleVersion = qcn->qmlModuleVersion();
text.clear();
- text << formattingRightMap()[ATOM_FORMATTING_BOLD]
- << formattingLeftMap()[ATOM_FORMATTING_TELETYPE]
- << "import " + qcn->qmlModuleName() + " " + qmlModuleVersion
- << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
+ text << "import " + qcn->qmlModuleName() + " " + qmlModuleVersion;
requisites.insert(importText, text);
//add the since and project into the map
--
GitLab