summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-03-23 18:47:13 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-03-26 12:01:14 +0100
commitedb64351cd0896d27af15d54d5fa868c7567eced (patch)
tree13c7356caaeee51c3b18550d365aee19ca0f3528 /src/xml
parent64db79f8560472b458cd80de52a1939b5bae2703 (diff)
QDom: preserve empty CDATA sections
Restores Qt 5 behavior. Fixes: QTBUG-101992 Pick-to: 6.3 6.2 Change-Id: I3b9fc077c0a0fd30f4fcce7bfa342dbe96b2c582 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/dom/qdomhelpers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xml/dom/qdomhelpers.cpp b/src/xml/dom/qdomhelpers.cpp
index aa499616d7..459a2b5311 100644
--- a/src/xml/dom/qdomhelpers.cpp
+++ b/src/xml/dom/qdomhelpers.cpp
@@ -364,7 +364,7 @@ bool QDomParser::parseBody()
break;
case QXmlStreamReader::Characters:
if (!reader->isWhitespace()) { // Skip the content consisting of only whitespaces
- if (!reader->text().trimmed().isEmpty()) {
+ if (reader->isCDATA() || !reader->text().trimmed().isEmpty()) {
if (!domBuilder.characters(reader->text().toString(), reader->isCDATA())) {
domBuilder.fatalError(QDomParser::tr(
"Error occurred while processing the element content"));