From 94dca6d10c40067a7bc90382b741062123c4402d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 23 Aug 2013 11:52:57 +0200 Subject: [PATCH] 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 --- src/tools/qdoc/qdocindexfiles.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index aab5e4f9aed..3283e978f4d 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());