diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-08-23 11:52:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-26 08:53:32 +0200 |
| commit | 94dca6d10c40067a7bc90382b741062123c4402d (patch) | |
| tree | 2bd6ff9228d02ce2725509181fdd741ce3ef9881 /src/tools | |
| parent | 404598b61366e681100893052fdb394702d3bcbf (diff) | |
qdoc: Fixed the relative link to installdir problem
Instead of using the fake "outputdir" to force qdoc
to generate a relative path to the actual output dir,
it now uses the value of HTML.outputsubdir, or just
"html" if HTML.outputsubdir is not specified.
Task-number: QTBUG-32580
Change-Id: I45c79a788e102213e6d343a7ed108a3d17d94759
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/qdocindexfiles.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index aab5e4f9ae..3283e978f4 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -133,7 +133,8 @@ void QDocIndexFiles::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(path.section('/', 0, -3) + "/outputdir"); + //QDir installDir(path.section('/', 0, -3) + "/outputdir"); + QDir installDir(path.section('/', 0, -3) + '/' + Generator::outputSubdir()); indexUrl = installDir.relativeFilePath(path).section('/', 0, -2); } project_ = indexElement.attribute("project", QString()); |