1 files changed, 11 insertions, 23 deletions

diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index 0c88cbc529..b24a6af660 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -2548,7 +2548,10 @@ void DitaXmlGenerator::generateHeader(const Node* node,
     if (!outputclass.isEmpty())
         xmlWriter().writeAttribute("outputclass",outputclass);
     writeStartTag(nameTag); // <title> or <apiName>
-    writeCharacters(name);
+    if (!name.isEmpty())
+        writeCharacters(name);
+    else
+        writeCharacters(node->name());
     writeEndTag(); // </title> or </apiName>
 }
 
@@ -3295,7 +3298,7 @@ void DitaXmlGenerator::generateOverviewList(const Node* relative, CodeMarker* /*
             QString group;
             bool isGroupPage = false;
             if (fakeNode->doc().metaCommandsUsed().contains("group")) {
-                group = fakeNode->doc().metaCommandArgs("group")[0];
+                group = fakeNode->doc().metaCommandArgs("group")[0].first;
                 isGroupPage = true;
             }
 
@@ -4493,7 +4496,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node,
         if (qpgn->childNodes().size() == 1) {
             qpn = static_cast<QmlPropertyNode*>(*p);
             startQmlProperty(qpn,relative,marker);
-            writeQmlDesc(node, marker);
+            writeApiDesc(node, marker, node->title());
             writeEndTag(); // </qmlPropertyDetail>
             writeEndTag(); // </qmlProperty>
         }
@@ -4506,7 +4509,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node,
             //writeCharacters("...");
             writeEndTag(); // </apiName>
             writeStartTag(DT_qmlPropertyGroupDetail);
-            writeQmlDesc(node, marker);
+            writeApiDesc(node, marker, node->title());
             writeEndTag(); // </qmlPropertyGroupDetail>
             while (p != qpgn->childNodes().end()) {
                 if ((*p)->type() == Node::QmlProperty) {
@@ -4524,7 +4527,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node,
         qpn = static_cast<QmlPropertyNode*>(node);
         if (qpn->qmlPropNodes().isEmpty()) {
             startQmlProperty(qpn,relative,marker);
-            writeQmlDesc(node, marker);
+            writeApiDesc(node, marker, node->title());
             writeEndTag(); // </qmlPropertyDetail>
             writeEndTag(); // </qmlProperty>
         }
@@ -4533,7 +4536,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node,
             if (n->type() == Node::QmlProperty) {
                 qpn = static_cast<QmlPropertyNode*>(n);
                 startQmlProperty(qpn,relative,marker);
-                writeQmlDesc(node, marker);
+                writeApiDesc(node, marker, node->title());
                 writeEndTag(); // </qmlPropertyDetail>
                 writeEndTag(); // </qmlProperty>
             }
@@ -4552,7 +4555,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(Node* node,
             //writeCharacters("...");
             writeEndTag(); // </apiName>
             writeStartTag(DT_qmlPropertyGroupDetail);
-            writeQmlDesc(node, marker);
+            writeApiDesc(node, marker, node->title());
             writeEndTag(); // </qmlPropertyGroupDetail>
             NodeList::ConstIterator p = qpn->qmlPropNodes().begin();
             while (p != qpn->qmlPropNodes().end()) {
@@ -4603,27 +4606,12 @@ void DitaXmlGenerator::writeQmlRef(DitaTag tag,
         writeEndTag(); // </qmlAttached>
     }
     writeEndTag(); // </qmlXxxDef>
-    writeQmlDesc(node, marker);
+    writeApiDesc(node, marker, node->title());
     writeEndTag(); // </qmlXxxDetail>
     writeEndTag(); // tag
 }
 
 /*!
-  Writes the <apiDesc> tag and its contents for the \a node.
-  The \a marker is used for markeing up the text body.
- */
-void DitaXmlGenerator::writeQmlDesc(Node* node, CodeMarker* marker)
-{
-    writeStartTag(DT_apiDesc);
-    generateStatus(node, marker);
-    generateBody(node, marker);
-    generateThreadSafeness(node, marker);
-    generateSince(node, marker);
-    generateAlsoList(node, marker);
-    writeEndTag(); // </apiDesc>
-}
-
-/*!
   This generates a <qmlTypeDef> in which the
   QML module name and version number are specified.
  */