Help generator: Add a global config for "extraFiles".

There should be a way to include files across projects regardless of
their project configuration.

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

diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index 1569871..43a781f 100644 (file)
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -83,6 +83,7 @@ HelpProjectWriter::HelpProjectWriter(const Config &config,
         if (project.fileName.isEmpty())
             project.fileName = defaultFileName;
         project.extraFiles = config.getStringSet(prefix + "extraFiles");
+        project.extraFiles += config.getStringSet(CONFIG_QHP + Config::dot + "extraFiles");
         project.indexTitle = config.getString(prefix + "indexTitle");
         project.indexRoot = config.getString(prefix + "indexRoot");
         project.filterAttributes = config.getStringList(prefix + "filterAttributes").toSet();