diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-10-13 20:17:09 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-10-16 16:36:10 +0200 |
| commit | 8687e163757df00c1e64c15ad63680ed5c2f6937 (patch) | |
| tree | b5f888bdead67f21c3fb524c10300889f278661b /src/qdoc/webxmlgenerator.cpp | |
| parent | 23b348e9e9583c8face308e58fcd2ac14f905b4d (diff) | |
qdoc: Add styling for \note, \important and \warning
And add Atom types for Warning instead of simply hard-coding a bold
warning note.
Fix a compiler warning for tst_generatedoutput in passing.
Pick-to: 6.2 5.15
Fixes: QTBUG-97448
Change-Id: I1fe691ffaadc549b17c8628817fe761d3be0fad7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/webxmlgenerator.cpp')
| -rw-r--r-- | src/qdoc/webxmlgenerator.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index 29a74754a..2f8f772b5 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -532,10 +532,6 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeCharacters(" "); break; - case Atom::ImportantRight: - writer.writeEndElement(); // para - break; - case Atom::LegaleseLeft: writer.writeStartElement("legalese"); break; @@ -612,7 +608,10 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeCharacters(" "); break; + // End admonition elements + case Atom::ImportantRight: case Atom::NoteRight: + case Atom::WarningRight: writer.writeEndElement(); // para break; @@ -737,6 +736,12 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeEndElement(); break; + case Atom::WarningLeft: + writer.writeStartElement("para"); + writer.writeTextElement("bold", "Warning:"); + writer.writeCharacters(" "); + break; + case Atom::UnhandledFormat: case Atom::UnknownCommand: writer.writeCharacters(atom->typeString()); |