qdoc: Recursively set the output subdirectory for InnerNode

When QDoc resolves and combines namespace child nodes located in
different modules to be under a single namespace node, it also changes
the output subdirectory of each child according to the destination
module.

However, if one of those child nodes is a namespace node or a class
node with nested child classes, the output subdir of those children is
left as the old (incorrect) directory.

This change fixes that by making the setOutputSubdirectory() function
recursive for nodes of type InnerNode.

Change-Id: I07b2f406283e1bf3bd8643797c3b789b0211b5bb
Reviewed-by: Martin Smith <martin.smith@digia.com>

1 files changed, 2 insertions, 1 deletions

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);