1 files changed, 31 insertions, 4 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 5fbdb487db..c293d48673 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -662,6 +662,16 @@ bool InnerNode::hasMembers() const
 }
 
 /*!
+  Appends \a node to the members list, if and only if it
+  isn't already in the members list.
+ */
+void InnerNode::addMember(Node* node)
+{
+    if (!members_.contains(node))
+        members_.append(node);
+}
+
+/*!
   Returns true if this node's members collection contains at
   least one namespace node.
  */
@@ -2161,10 +2171,13 @@ void QmlClassNode::subclasses(const QString& base, NodeList& subs)
   This function splits \a arg on the blank character to get a
   QML module name and version number. It then spilts the version
   number on the '.' character to get a major version number and
-  a minor vrsion number. Both version numbers must be present.
-  It stores these components separately. If all three are found,
-  true is returned. If any of the three is not found or is not
-  correct, false is returned.
+  a minor vrsion number. Both major the major and minor version
+  numbers should be present, but the minor version number is not
+  absolutely necessary.
+
+  It stores the three components separately in this node. If all
+  three are found, true is returned. If any of the three is not
+  found or is not in the correct format, false is returned.
  */
 bool Node::setQmlModuleInfo(const QString& arg)
 {
@@ -2185,6 +2198,20 @@ bool Node::setQmlModuleInfo(const QString& arg)
 }
 
 /*!
+  If this QML type node has a base type node,
+  return the fully qualified name of that QML
+  type, i.e. <QML-module-name>::<QML-type-name>.
+ */
+QString QmlClassNode::qmlFullBaseName() const
+{
+    QString result;
+    if (baseNode_) {
+        result = baseNode_->qmlModuleIdentifier() + "::" + baseNode_->name();
+    }
+    return result;
+}
+
+/*!
   The name of this QML class node might be the same as the
   name of some other QML class node. If so, then this node's
   parent will be a NameCollisionNode.This function sets the