summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-15 10:27:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-15 10:27:32 (GMT)
commitf2d600c634f114f3f58a55873c9d993ba9767135 (patch)
treeaf125174e8c5ae087ebd6ff1d80bd53ff6ad5110
parent3ddedbf509b39108653a6c08710abfeeef321f8e (diff)
parent75aea79ce599d5f62a1642a875774544f548c904 (diff)
downloadQt-f2d600c634f114f3f58a55873c9d993ba9767135.zip
Qt-f2d600c634f114f3f58a55873c9d993ba9767135.tar.gz
Qt-f2d600c634f114f3f58a55873c9d993ba9767135.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18790
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index e394249..5f44cd8 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -769,6 +769,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
case Atom::Code:
{
writeStartTag(DT_codeblock);
+ xmlWriter().writeAttribute("outputclass","cpp");
QString chars = trimmedTrailing(atom->string());
writeText(chars, marker, relative);
writeEndTag(); // </codeblock>
@@ -776,6 +777,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
break;
case Atom::Qml:
writeStartTag(DT_codeblock);
+ xmlWriter().writeAttribute("outputclass","qml");
writeText(trimmedTrailing(atom->string()), marker, relative);
writeEndTag(); // </codeblock>
break;