qdoc: Make doc configuration aware of the output format

With the introduction of the WebXML output format, QDoc can no longer
assume that the configuration is specific to HTML. In particular,

Config variables:

- Output directory and subdirectory can now be set for each format.
- 'quotinginformation' can now be prefixed with '<format>.' qualifier.
  Because the same parsed tree of atoms is used for all generators,
  we need to include both the quoting information and the related
  code snippets in the list of atoms; generators then decide what to
  include in the output.

Index files:

- Look for index files under the output subdirectory for each specified
  format.

This allows per-format configuration and passing multiple formats in
'outputformats' configuration variable.

Clean up and refactor the code related to processing doc config
variables.

Task-number: PYSIDE-363
Change-Id: I66e9c71311689a777fcb445d3b1a8ef070dff93d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index 46d7c5bf1..685add0f9 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -342,11 +342,12 @@ int Config::getInt(const QString& var) const
 }
 
 /*!
-  Function to return the correct outputdir.
+  Function to return the correct outputdir for the output \a format.
+  If \a format is not specified, defaults to 'HTML'.
   outputdir can be set using the qdocconf or the command-line
   variable -outputdir.
   */
-QString Config::getOutputDir() const
+QString Config::getOutputDir(const QString &format) const
 {
     QString t;
     if (overrideOutputDir.isNull())
@@ -359,7 +360,7 @@ QString Config::getOutputDir() const
     }
     if (!Generator::useOutputSubdirs()) {
         t = t.left(t.lastIndexOf('/'));
-        QString singleOutputSubdir = getString("HTML.outputsubdir");
+        QString singleOutputSubdir = getString(format + Config::dot + "outputsubdir");
         if (singleOutputSubdir.isEmpty())
             singleOutputSubdir = "html";
         t += QLatin1Char('/') + singleOutputSubdir;