summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-07-05 14:49:10 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-06 03:54:38 +0200
commit33730f3b28d29748efb71355e7ee67f91e7a1f5e (patch)
tree058911299f4552ea4167da675fff65a1fcb69fd1 /src
parent3101f9d92c1b1135e48956436214a8ac1287f1ab (diff)
QDoc: Fix relative URL generation for cross-linking.
Previously the URL relative to the installdir was used, now we use a relative URL to the index file. Change-Id: Ia2485aa49da8240901d0db1f102eb48da689ef2a Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/tree.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index 1bf3618393..9de182f38f 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -948,7 +948,7 @@ void Tree::readIndexFile(const QString& path)
else {
// Use a fake directory, since we will copy the output to a sub directory of
// installDir when using "make install". This is just for a proper relative path.
- QDir installDir(Config::installDir + "/outputdir");
+ QDir installDir(path.section('/', 0, -3) + "/outputdir");
indexUrl = installDir.relativeFilePath(path).section('/', 0, -2);
}