Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I0653ca8dd6a9b6ee2314911c7679a1c056dc3709

2 files changed, 6 insertions, 3 deletions

diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index ef00d5d..b1af3b1 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -253,6 +253,7 @@ XsdSchemaParser::XsdSchemaParser(const XsdSchemaContext::Ptr &context, const Xsd
     , m_parserContext(parserContext)
     , m_namePool(m_parserContext->namePool())
     , m_namespaceSupport(m_namePool)
+    , m_defaultOpenContentAppliesToEmpty(false)
 {
     m_schema = m_parserContext->schema();
     m_schemaResolver = m_parserContext->resolver();
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
index 9952b1f..91424a8 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
@@ -55,14 +55,16 @@
 
 template <typename TransitionType>
 XsdStateMachine<TransitionType>::XsdStateMachine()
-    : m_counter(50)
+    : m_counter(50),
+      m_lastTransition()
 {
 }
 
 template <typename TransitionType>
 XsdStateMachine<TransitionType>::XsdStateMachine(const NamePool::Ptr &namePool)
-    : m_namePool(namePool)
-    , m_counter(50)
+    : m_namePool(namePool),
+      m_counter(50),
+      m_lastTransition()
 {
 }