diff options
author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-22 16:05:48 (GMT) |
---|---|---|
committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-22 18:34:17 (GMT) |
commit | a0f08012e0e26673635a6f4e3c496bf53f558726 (patch) | |
tree | 3f5ca3c4a1c488453600c610078af8a96a5d137a /tools/qdoc3 | |
parent | 7f53a83a4761a90756003e68691a2959f3eb3c1a (diff) | |
download | Qt-a0f08012e0e26673635a6f4e3c496bf53f558726.zip Qt-a0f08012e0e26673635a6f4e3c496bf53f558726.tar.gz Qt-a0f08012e0e26673635a6f4e3c496bf53f558726.tar.bz2 |
Fix qdoc output for <dependency> tag.
Also prepend relative path if required.
Reviewed-By: trustme
Diffstat (limited to 'tools/qdoc3')
-rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index b7a5120..bc84288 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4506,12 +4506,9 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) if (!en->dependencies().isEmpty()) { for (int idx=0; idx<en->dependencies().size(); ++idx) { writer.writeStartElement("dependency"); - QString file = "$QTDIR/"; - if (demos) - file += "demos/"; - else - file += "examples/"; - file += en->dependencies()[idx]; + QString file(en->dependencies()[idx]); + if (!relativePath.isEmpty()) + file.prepend(relativePath); writer.writeCharacters(file); writer.writeEndElement(); // dependency } |