Merge "Merge remote-tracking branch 'origin/5.15' into dev"

3 files changed, 3 insertions, 3 deletions

diff --git a/src/xmlpatterns/schema/qxsdparticlechecker.cpp b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
index 139390d..ad7cc8e 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
@@ -464,7 +464,7 @@ bool XsdParticleChecker::subsumes(const XsdParticle::Ptr &particle, const XsdPar
     }
 
     QHash<XsdTerm::Ptr, XsdParticle::Ptr> particlesHash = XsdStateMachineBuilder::particleLookupMap(particle);
-    particlesHash.unite(XsdStateMachineBuilder::particleLookupMap(derivedParticle));
+    particlesHash.insert(XsdStateMachineBuilder::particleLookupMap(derivedParticle));
 
 /*
     static int counter = 0;
diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp
index 91a796a..9f7c6a2 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker.cpp
+++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp
@@ -105,7 +105,7 @@ void XsdSchemaChecker::check()
 
 void XsdSchemaChecker::addComponentLocationHash(const ComponentLocationHash &hash)
 {
-    m_componentLocationHash.unite(hash);
+    m_componentLocationHash.insert(hash);
 }
 
 /**
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index 1d21e31..7ca3808 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@ -264,7 +264,7 @@ void XsdSchemaResolver::addSubstitutionGroupType(const XsdElement::Ptr &element)
 
 void XsdSchemaResolver::addComponentLocationHash(const ComponentLocationHash &hash)
 {
-    m_componentLocationHash.unite(hash);
+    m_componentLocationHash.insert(hash);
 }
 
 void XsdSchemaResolver::addEnumerationFacetValue(const AtomicValue::Ptr &facetValue, const NamespaceSupport &namespaceSupport)