diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-10 07:36:53 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-10 07:36:53 (GMT) |
| commit | 2381978f965c1a07e4e1c9c262393b7fcb7a3571 (patch) | |
| tree | 06a378d80955755bfa1ddc326c51d743a898d86f | |
| parent | 421a9648767f8de54cf2b9460aaf15d754f5dccd (diff) | |
| parent | fcc8a1b6ff261f128969458146185c9ed9d5892b (diff) | |
| download | Qt-2381978f965c1a07e4e1c9c262393b7fcb7a3571.zip Qt-2381978f965c1a07e4e1c9c262393b7fcb7a3571.tar.gz Qt-2381978f965c1a07e4e1c9c262393b7fcb7a3571.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index cc7b1da..6ea371c 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -5614,7 +5614,6 @@ DitaXmlGenerator::writeProlog(const InnerNode* inner, CodeMarker* marker) xmlWriter().writeCharacters(category); writeEndTag(); // <category> if (vrm.size() > 0) { - qDebug() << "VRM" << vrm; writeStartTag(DT_prodinfo); writeStartTag(DT_prodname); xmlWriter().writeCharacters(projectDescription); @@ -5629,6 +5628,12 @@ DitaXmlGenerator::writeProlog(const InnerNode* inner, CodeMarker* marker) xmlWriter().writeAttribute("modification",vrm[2]); writeEndTag(); // <vrm> writeEndTag(); // <vrmlist> + QString component = inner->moduleName(); + if (!component.isEmpty()) { + writeStartTag(DT_component); + xmlWriter().writeCharacters(component); + writeEndTag(); // <prodinfo> + } writeEndTag(); // <prodinfo> } writeEndTag(); // <metadata> |