aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-04-22 16:14:21 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-22 19:47:48 +0000
commit19f7377feb661a1a7dc1fe5a1ffd3305702618a4 (patch)
tree3a970a26f67ab1e488e28f16351f7e26d888621b
parentf1614a0d24bcfaa9f452057556d01df8942dedfe (diff)
shiboken6: Fix XML errors when injecting target format (RST) documentation
In writeInjectDocumentation(), pass class Documentation (including format) instead of just the string to writeFormattedText() to prevent it from running through XMLToSphinx. Change-Id: I6116552fc3ea8f7ddc1cc07d51370f868de97bb3 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit d9b11bb733e3a3e2546634f6792691aaa473be65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
index 01cde5923..8f3db0493 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
@@ -616,7 +616,7 @@ bool QtDocGenerator::writeInjectDocumentation(TextStream& s,
continue;
doc.setValue(mod.code(), Documentation::Detailed, fmt);
- writeFormattedText(s, doc.value(), cppClass);
+ writeFormattedText(s, doc, cppClass);
didSomething = true;
}
}