diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:04:52 +0100 |
| commit | ff18ac06286c453acfd3929ebc806229cd1eb69f (patch) | |
| tree | 20e62c671f0aed3695da7148f28f685daa008ed2 /src/xmlpatterns/schema/qxsdparticlechecker.cpp | |
| parent | 3ab7db4af2f6fba953454e8bcd6ee982198637ae (diff) | |
| parent | e263fec484d23fc2e652f538f39934b5364339e1 (diff) | |
| download | qtxmlpatterns-ff18ac06286c453acfd3929ebc806229cd1eb69f.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia0f79b0c59c6339e471533b644f40995d8c4df37
Diffstat (limited to 'src/xmlpatterns/schema/qxsdparticlechecker.cpp')
| -rw-r--r-- | src/xmlpatterns/schema/qxsdparticlechecker.cpp | 2 |
1 files changed, 1 insertions, 1 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; |