Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e

2 files changed, 12 insertions, 1 deletions

diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index a6999d3856..b2f93cc131 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -1199,6 +1199,16 @@ void InnerNode::removeChild(Node *child)
 }
 
 /*!
+ Recursively sets the output subdirectory for children
+ */
+void InnerNode::setOutputSubdirectory(const QString &t)
+{
+    Node::setOutputSubdirectory(t);
+    for (int i = 0; i < childNodes().size(); ++i)
+        childNodes().at(i)->setOutputSubdirectory(t);
+}
+
+/*!
   Find the module (Qt Core, Qt GUI, etc.) to which the class belongs.
   We do this by obtaining the full path to the header file's location
   and examine everything between "src/" and the filename.  This is
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index 654004e425..7dd868c3c0 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -319,7 +319,7 @@ public:
     QmlTypeNode* qmlTypeNode();
     ClassNode* declarativeCppNode();
     const QString& outputSubdirectory() const { return outSubDir_; }
-    void setOutputSubdirectory(const QString& t) { outSubDir_ = t; }
+    virtual void setOutputSubdirectory(const QString& t) { outSubDir_ = t; }
     QString fullDocumentName() const;
     static QString cleanId(const QString &str);
     QString idForNode() const;
@@ -410,6 +410,7 @@ public:
     void printChildren(const QString& title);
     void addChild(Node* child);
     void removeChild(Node* child);
+    virtual void setOutputSubdirectory(const QString& t);
 
 protected:
     InnerNode(Type type, InnerNode* parent, const QString& name);