diff options
author | Martin Smith <martin.smith@nokia.com> | 2011-11-21 12:38:13 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2011-11-21 12:38:13 (GMT) |
commit | b9f0c6c8026f5f7f6924a42ded8f73f1c9cd9b75 (patch) | |
tree | 8c9031c401258e20c7a603a07da205a28950fbc6 /tools/qdoc3 | |
parent | a6a4f5343ac67a4921c86fa70fc1ae49b1ef3b7d (diff) | |
download | Qt-b9f0c6c8026f5f7f6924a42ded8f73f1c9cd9b75.zip Qt-b9f0c6c8026f5f7f6924a42ded8f73f1c9cd9b75.tar.gz Qt-b9f0c6c8026f5f7f6924a42ded8f73f1c9cd9b75.tar.bz2 |
qdoc3: qdoc supports \depends in 4.8
This is what you write...
/*!
\example designer/calculatorbuilder
\depends qmlapplicationviewer
\title Calculator Builder Example
This is what you get...
<example name="Calculator Builder Example"
docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html"
projectPath="designer/calculatorbuilder/calculatorbuilder.pro"
imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png">
<description><![CDATA[The Calculator Builder example shows how to create a user interface from
a Qt Designer form at run-time, using the QUiLoader class.]]></description>
<tags>calculator,builder</tags>
<fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen>
<dependency>$QTDIR/examples/qmlapplicationviewer</dependency>
</example>
Task-number: QTBUG-22838
Diffstat (limited to 'tools/qdoc3')
-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 |