summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/generator.cpp
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-06-05 13:58:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-05 16:01:29 +0200
commit21ebd2e4ebe1fb89d8188d0362ef45ff4abe9292 (patch)
treecca999f8d84c8e1b58d9e7f3e9c06afd5508479d /src/tools/qdoc/generator.cpp
parent143daa6ac29940f0136034c99cddc932a4ec0a42 (diff)
QDoc: Look for template and include() under installdir.
The installdir will now also be used to search for include() qdocconf variables and the stylesheet. Change-Id: I388392114fd5a8d57bab0b71699b30e4a6ddd46e Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools/qdoc/generator.cpp')
-rw-r--r--src/tools/qdoc/generator.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 4f0c69ff9d..12f27ca811 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -1659,6 +1659,10 @@ void Generator::initialize(const Config &config)
++e;
}
+ if (!Config::installDir.isEmpty()) {
+ searchDirs.append(Config::installDir);
+ }
+
QStringList styles =
config.getCleanPathList((*g)->format()+Config::dot+CONFIG_STYLESHEETS);
e = styles.constBegin();