diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:30 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:30 +0200 |
commit | 78ec450b81c403d3b4e6a2c178e300cef3637cca (patch) | |
tree | 381e78957e2927b22472114e9f37553d743103cd | |
parent | 0c05780ea319ca9e9576ce3eb2ddea18b0ee975e (diff) | |
parent | c80de46664c31d98a1253acd712f62d9b0449e59 (diff) | |
download | qtsvg-78ec450b81c403d3b4e6a2c178e300cef3637cca.tar.gz |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15
Change-Id: I2a54a0996a70a49ba4df607dc255a427f6a5e878
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/svg/qsvghandler.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1c703d4..bf083d6 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.8 +MODULE_VERSION = 5.15.9 diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index a5f877f..b2227b6 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -3691,9 +3691,7 @@ void QSvgHandler::parse() case QXmlStreamReader::EndElement: endElement(xml->name()); ++remainingUnfinishedElements; - // if we are using somebody else's qxmlstreamreader - // we should not read until the end of the stream - done = !m_ownsReader && (xml->name() == QLatin1String("svg")); + done = (xml->name() == QLatin1String("svg")); break; case QXmlStreamReader::Characters: characters(xml->text()); |