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

Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index ec1e49d2fb..08ee9b4e9b 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -50,7 +50,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qtextstream.h>
-
+#include "config.h"
 #include "node.h"
 #include "text.h"
 
@@ -70,6 +70,7 @@ class Generator
 
 public:
     enum Passes { Both, Prepare, Generate };
+    enum ListType { Generic, Obsolete };
 
     Generator();
     virtual ~Generator();
@@ -81,11 +82,13 @@ public:
     virtual void terminateGenerator();
 
     QString fullDocumentLocation(const Node *node, bool subdir = false);
+    const Config* config() { return config_; }
 
     static Generator *currentGenerator() { return currentGenerator_; }
     static Generator *generatorForFormat(const QString& format);
     static void initialize(const Config& config);
     static const QString& outputDir() { return outDir_; }
+    static const QString& outputSubdir() { return outSubdir_; }
     static void terminate();
     static void writeOutFileNames();
     static void augmentImageDirs(QSet<QString>& moreImageDirs);
@@ -192,6 +195,7 @@ private:
     static QMap<QString, QStringList> imgFileExts;
     static QString project;
     static QString outDir_;
+    static QString outSubdir_;
     static QSet<QString> outputFormats;
     static QHash<QString, QString> outputPrefixes;
     static QStringList scriptDirs;
@@ -222,6 +226,7 @@ private:
     QRegExp tag;
 
  protected:
+    const Config* config_;
     QDocDatabase* qdb_;
     bool inLink_;
     bool inContents_;