diff options
| author | Sami Rosendahl <ext-sami.1.rosendahl@nokia.com> | 2012-02-02 15:01:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 14:13:34 +0100 |
| commit | 65d2458408ccda1b37e1069fd13791a60fa0c672 (patch) | |
| tree | 420cc6232eadb558edbcc5de7a86bde74175e88d /src/xmlpatterns/api/qabstractxmlnodemodel.cpp | |
| parent | 42db8b2df643ca46b5c096f8e0951ef158a9c687 (diff) | |
| download | qtxmlpatterns-65d2458408ccda1b37e1069fd13791a60fa0c672.tar.gz | |
Fix for commit f42f82f435d738339ad85c1380d1167338517247
Qt5 change I758df57551ec49ce8c8b357794177b4e6c454d2f had mistakenly removed
intialization of QXmlItem::m_atomicValue from
QXmlItem::QXmlItem(const QVariant &atomicValue) constructor in a special
case. This commit restores the initialization.
Change-Id: I5ddc12bf0ff5d1d365471bb09d4eb3cdadd01b9b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/xmlpatterns/api/qabstractxmlnodemodel.cpp')
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 6c299dd..6dfaad2 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -1181,6 +1181,10 @@ QXmlItem::QXmlItem(const QVariant &atomicValue) m_node.model = reinterpret_cast<const QAbstractXmlNodeModel *>(~0); m_atomicValue = temp.asAtomicValue(); } + else + { + m_atomicValue = 0; + } } /*! |