Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: If4a67889fb7dafb929930d5e572b154244f66ae9

3 files changed, 6 insertions, 6 deletions

diff --git a/src/xmlpatterns/schema/qxsdelement.cpp b/src/xmlpatterns/schema/qxsdelement.cpp
index 8a150fb..94d3610 100644
--- a/src/xmlpatterns/schema/qxsdelement.cpp
+++ b/src/xmlpatterns/schema/qxsdelement.cpp
@@ -53,12 +53,12 @@ XsdElement::Scope::Variety XsdElement::Scope::variety() const
     return m_variety;
 }
 
-void XsdElement::Scope::setParent(const NamedSchemaComponent::Ptr &parent)
+void XsdElement::Scope::setParent(const NamedSchemaComponent *parent)
 {
     m_parent = parent;
 }
 
-NamedSchemaComponent::Ptr XsdElement::Scope::parent() const
+const NamedSchemaComponent *XsdElement::Scope::parent() const
 {
     return m_parent;
 }
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index 714d8f4..12dd12d 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -125,16 +125,16 @@ namespace QPatternist
                     /**
                      * Sets the @p parent complex type or model group definition of the element scope.
                      */
-                    void setParent(const NamedSchemaComponent::Ptr &parent);
+                    void setParent(const NamedSchemaComponent *parent);
 
                     /**
                      * Returns the parent complex type or model group definition of the element scope.
                      */
-                    NamedSchemaComponent::Ptr parent() const;
+                    const NamedSchemaComponent *parent() const;
 
                 private:
                     Variety                   m_variety;
-                    NamedSchemaComponent::Ptr m_parent;
+                    const NamedSchemaComponent *m_parent = nullptr;
             };
 
             /**
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index 8bbda27..6c4eafe 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -4772,7 +4772,7 @@ XsdTerm::Ptr XsdSchemaParser::parseLocalElement(const XsdParticle::Ptr &particle
     } else {
         element->setScope(XsdElement::Scope::Ptr(new XsdElement::Scope()));
         element->scope()->setVariety(XsdElement::Scope::Local);
-        element->scope()->setParent(parent);
+        element->scope()->setParent(parent.data());
 
         if (hasAttribute(QString::fromLatin1("name"))) {
             const QString elementName = readNameAttribute("element");