qdoc: Added the fix to change qml-qml-file.name to qml-file.name

(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 56e3484b06..540ffa9383 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -1963,8 +1963,8 @@ QString Tree::fullDocumentLocation(const Node *node) const
         if ((node->subType() == Node::QmlClass) ||
             (node->subType() == Node::QmlBasicType)) {
             QString fb = node->fileBase();
-            if (fb.startsWith(QLatin1String("QML:")))
-                return node->fileBase() + ".html";
+            if (fb.startsWith(QLatin1String("qml-")))
+                return fb + ".html";
             else
                 return "qml-" + node->fileBase() + ".html";
         } else
@@ -1981,7 +1981,7 @@ QString Tree::fullDocumentLocation(const Node *node) const
     else if ((parentNode = node->parent())) {
         if (parentNode->subType() == Node::QmlPropertyGroup) {
             parentNode = parentNode->parent();
-            parentName = "qml-" + parentNode->fileBase() + ".html";
+            parentName = fullDocumentLocation(parentNode);
         }
         else
             parentName = fullDocumentLocation(node->parent());