summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-08-11 11:13:14 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-08-12 09:33:41 +0000
commitbf403e688c8a3a5ace20b7ee1c1af54b850c4a55 (patch)
tree45d4c646436fb667271d2792fb757abb68f6b106
parent2bd640b8d454c573ddd37bf696bb048e552c4531 (diff)
downloadqttools-bf403e688c8a3a5ace20b7ee1c1af54b850c4a55.tar.gz
qdoc: Fix assert in the DocBook generator when writing property docs
QXmlStreamWriter::writeAttribute() must be preceded by writeStartElement. Change-Id: Ib73c44b16308b882d80544ec07cddf80339bb315 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit cb3d21e8085995e99ab60c66b361ed379054102a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/docbookgenerator.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp
index 0ca480c87..df571eff5 100644
--- a/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/docbookgenerator.cpp
@@ -3589,8 +3589,11 @@ void DocBookGenerator::generateDetailedMember(const Node *node, const PageNode *
if (!section.members().isEmpty()) {
writer->writeStartElement(dbNamespace, "para");
newLine();
- writer->writeTextElement(dbNamespace, "emphasis", "Access functions:");
+ writer->writeStartElement(dbNamespace, "emphasis");
writer->writeAttribute("role", "bold");
+ writer->writeCharacters("Access functions:");
+ newLine();
+ writer->writeEndElement(); // emphasis
newLine();
writer->writeEndElement(); // para
newLine();
@@ -3603,8 +3606,11 @@ void DocBookGenerator::generateDetailedMember(const Node *node, const PageNode *
if (!notifiers.members().isEmpty()) {
writer->writeStartElement(dbNamespace, "para");
newLine();
- writer->writeTextElement(dbNamespace, "emphasis", "Notifier signal:");
+ writer->writeStartElement(dbNamespace, "emphasis");
writer->writeAttribute("role", "bold");
+ writer->writeCharacters("Notifier signal:");
+ newLine();
+ writer->writeEndElement(); // emphasis
newLine();
writer->writeEndElement(); // para
newLine();