diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-21 17:42:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-21 17:42:02 (GMT) |
| commit | 6b1c4806cf668ef30ece2f9eba869c622705157a (patch) | |
| tree | 8c9031c401258e20c7a603a07da205a28950fbc6 /tools | |
| parent | 5152835c4bf6dd576906118be63df452cb0be60d (diff) | |
| parent | b9f0c6c8026f5f7f6924a42ded8f73f1c9cd9b75 (diff) | |
| download | Qt-6b1c4806cf668ef30ece2f9eba869c622705157a.zip Qt-6b1c4806cf668ef30ece2f9eba869c622705157a.tar.gz Qt-6b1c4806cf668ef30ece2f9eba869c622705157a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
qdoc3: qdoc supports \depends in 4.8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index a840c93..f1c0b8f 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4485,10 +4485,15 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) } if (!en->dependencies().isEmpty()) { for (int idx=0; idx<en->dependencies().size(); ++idx) { - writer.writeStartElement("depends"); - QString file = "../../" + en->dependencies()[idx]; + writer.writeStartElement("dependency"); + QString file = "$QTDIR/"; + if (demos) + file += "demos/"; + else + file += "examples/"; + file += en->dependencies()[idx]; writer.writeCharacters(file); - writer.writeEndElement(); // depends + writer.writeEndElement(); // dependency } } writer.writeEndElement(); // example |