diff options
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index d5e079d910..2dc4c1e6c6 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -2287,10 +2287,19 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative, generateText(brief, node, marker); out() << "</p></td>"; } + else if (!node->reconstitutedBrief().isEmpty()) { + out() << "<td class=\"tblDescr\"><p>"; + out() << node->reconstitutedBrief(); + out() << "</p></td>"; + } } else { out() << "<td class=\"tblDescr\"><p>"; - out() << protectEnc(node->doc().briefText().toString()); + if (!node->reconstitutedBrief().isEmpty()) { + out() << node->reconstitutedBrief(); + } + else + out() << protectEnc(node->doc().briefText().toString()); out() << "</p></td>"; } out() << "</tr>\n"; @@ -4117,8 +4126,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) if (child->subType() == Node::File) { QString file = child->name(); if (file.endsWith(".pro") || file.endsWith(".qmlproject")) { - if (file.startsWith("demos/")) - file = file.mid(6); proFiles << file; } } @@ -4233,8 +4240,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) if (baseName.compare(ename, Qt::CaseInsensitive) == 0) { if (!usedNames.contains(fileName)) { writer.writeStartElement("fileToOpen"); - if (file.startsWith("demos/")) - file = file.mid(6); writer.writeCharacters(examplesPath + file); writer.writeEndElement(); // fileToOpen usedNames.insert(fileName); @@ -4244,8 +4249,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) fileName.toLower().endsWith("main.qml")) { if (!usedNames.contains(fileName)) { writer.writeStartElement("fileToOpen"); - if (file.startsWith("demos/")) - file = file.mid(6); writer.writeCharacters(examplesPath + file); writer.writeEndElement(); // fileToOpen usedNames.insert(fileName); |