diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/corelib/serialization/convert/xmlconverter.cpp | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/corelib/serialization/convert/xmlconverter.cpp')
| -rw-r--r-- | examples/corelib/serialization/convert/xmlconverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index 62908273ce..e62801bf76 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -70,7 +70,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options static QVariantList listFromXml(QXmlStreamReader &xml, Converter::Options options) { QVariantList list; - while (!xml.atEnd() && !xml.isEndElement()) { + while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == QLatin1String("list"))) { xml.readNext(); switch (xml.tokenType()) { case QXmlStreamReader::StartElement: @@ -107,7 +107,7 @@ static QVariantList listFromXml(QXmlStreamReader &xml, Converter::Options option static VariantOrderedMap::value_type mapEntryFromXml(QXmlStreamReader &xml, Converter::Options options) { QVariant key, value; - while (!xml.atEnd() && !xml.isEndElement()) { + while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == QLatin1String("entry"))) { xml.readNext(); switch (xml.tokenType()) { case QXmlStreamReader::StartElement: @@ -150,7 +150,7 @@ static QVariant mapFromXml(QXmlStreamReader &xml, Converter::Options options) QVariantMap map1; VariantOrderedMap map2; - while (!xml.atEnd() && !xml.isEndElement()) { + while (!xml.atEnd() && !(xml.isEndElement() && xml.name() == QLatin1String("map"))) { xml.readNext(); switch (xml.tokenType()) { case QXmlStreamReader::StartElement: |