diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-06 16:20:08 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-07 10:15:52 +0100 |
| commit | ce85e1b2286b44362f6d74fac488574db74d7387 (patch) | |
| tree | e5e78b8c42a1c0c7bec4e100d105ee5f11da85b2 /src/tools | |
| parent | 2efbf2dbbe1ff65c0624ba05a432d0e0e4a7d92f (diff) | |
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>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 15698713ae..43a781f972 100644 --- 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(); |