summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/config.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/config.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/config.cpp')
-rw-r--r--src/tools/qdoc/config.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index 09b752c236..905dba6ba5 100644
--- a/src/tools/qdoc/config.cpp
+++ b/src/tools/qdoc/config.cpp
@@ -714,7 +714,10 @@ void Config::load(Location location, const QString& fileName)
QFile fin(fileName);
if (!fin.open(QFile::ReadOnly | QFile::Text)) {
- fin.setFileName(fileName + QLatin1String(".qdoc"));
+ if (!Config::installDir.isEmpty()) {
+ int prefix = location.filePath().length() - location.fileName().length();
+ fin.setFileName(Config::installDir + "/" + fileName.right(fileName.length() - prefix));
+ }
if (!fin.open(QFile::ReadOnly | QFile::Text))
location.fatal(tr("Cannot open file '%1': %2").arg(fileName).arg(fin.errorString()));
}