diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index f16c35c3a9..87a055ae0f 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2572,6 +2572,9 @@ QString Node::fullDocumentName() const
 
     // Create a name based on the type of the ancestor node.
     QString concatenator = "::";
+    if (n->isQmlType())
+        concatenator = QLatin1Char('.');
+
     if (n->isDocNode())
         concatenator = QLatin1Char('#');
 
diff --git a/src/tools/qdoc/qdoctagfiles.cpp b/src/tools/qdoc/qdoctagfiles.cpp
index cc2bd3f1f0..4809227413 100644
--- a/src/tools/qdoc/qdoctagfiles.cpp
+++ b/src/tools/qdoc/qdoctagfiles.cpp
@@ -120,6 +120,7 @@ void QDocTagFiles::generateTagFileCompounds(QXmlStreamWriter& writer, const Inne
             kind = "namespace";
             break;
         case Node::Class:
+        case Node::QmlType:
             kind = "class";
             break;
         case Node::Enum: