1 files changed, 7 insertions, 9 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index b2f93cc131..8e094f38c4 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -151,11 +151,6 @@ QString Node::fullName(const Node* relative) const
 {
     if (isDocumentNode())
         return title();
-    else if (isClass()) {
-        const ClassNode* cn = static_cast<const ClassNode*>(this);
-        if (!cn->serviceName().isEmpty())
-            return cn->serviceName();
-    }
     return plainFullName(relative);
 }
 
@@ -888,12 +883,14 @@ void InnerNode::setOverload(FunctionNode *func, bool overlode)
 /*!
   Mark all child nodes that have no documentation as having
   private access and internal status. qdoc will then ignore
-  them for documentation purposes.
+  them for documentation purposes. Some nodes have an
+  Intermediate status, meaning that they should be ignored,
+  but not their children.
  */
 void InnerNode::makeUndocumentedChildrenInternal()
 {
     foreach (Node *child, childNodes()) {
-        if (child->doc().isEmpty()) {
+        if (child->doc().isEmpty() && child->status() != Node::Intermediate) {
             child->setAccess(Node::Private);
             child->setStatus(Node::Internal);
         }
@@ -2127,9 +2124,10 @@ void QmlTypeNode::terminate()
  */
 void QmlTypeNode::addInheritedBy(const QString& base, Node* sub)
 {
-    if (inheritedBy.constFind(base,sub) == inheritedBy.constEnd()) {
+    if (sub->isInternal())
+        return;
+    if (inheritedBy.constFind(base,sub) == inheritedBy.constEnd())
         inheritedBy.insert(base,sub);
-    }
 }
 
 /*!