diff -r ef0373b55136 -r 758a864f9613 tools/qdoc3/tree.cpp
--- a/tools/qdoc3/tree.cpp	Fri Sep 17 08:34:18 2010 +0300
+++ b/tools/qdoc3/tree.cpp	Mon Oct 04 01:19:32 2010 +0300
@@ -1963,8 +1963,8 @@
         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 @@
     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());