diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 12:08:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 12:08:43 (GMT) |
| commit | 1e75074df0424f652c0ad1f28ef822a6a4b7d9f6 (patch) | |
| tree | 7d4109b80d8fa7111d8d3b667c76ccfab8a8a0ac | |
| parent | e89a552f32592abf6478af3fcd54e05be339acd1 (diff) | |
| parent | eab121a9023eee10b49813161867011dc9fb9689 (diff) | |
| download | Qt-1e75074df0424f652c0ad1f28ef822a6a4b7d9f6.zip Qt-1e75074df0424f652c0ad1f28ef822a6a4b7d9f6.tar.gz Qt-1e75074df0424f652c0ad1f28ef822a6a4b7d9f6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QXmlSchema: fix crash in schema parser
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp index 6d878e8..6ed28af 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser.cpp +++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp @@ -4832,7 +4832,7 @@ XsdTerm::Ptr XsdSchemaParser::parseLocalElement(const XsdParticle::Ptr &particle if (isSchemaTag(XsdSchemaToken::Annotation, token, namespaceToken)) { const XsdAnnotation::Ptr annotation = parseAnnotation(); - element->addAnnotation(annotation); + term->addAnnotation(annotation); } else if (isSchemaTag(XsdSchemaToken::SimpleType, token, namespaceToken)) { if (hasRefAttribute) { error(QtXmlPatterns::tr("%1 element with %2 child element must not have a %3 attribute.") |