diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-11-07 17:16:21 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-12-12 15:25:39 +0100 |
commit | b79d74e96f078580adfd403c8118f1e5429bfb8d (patch) | |
tree | aa7bb429361ccdcd06cecbd503707d12a5d22735 /src/tools/moc/moc.cpp | |
parent | 1c98479aa2d39d099b548e1161e402ad8f05d6f2 (diff) |
moc: change QMap::unite to QMap::insert
Which is the intended behavior.
Change-Id: I0cffc623fc09284f3d95850f840564dca20ed0d4
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r-- | src/tools/moc/moc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 8cc605fd8a..58c9f88328 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -930,9 +930,9 @@ void Moc::parse() if (it != classList.end()) { it->classInfoList += def.classInfoList; - it->enumDeclarations.unite(def.enumDeclarations); + it->enumDeclarations.insert(def.enumDeclarations); it->enumList += def.enumList; - it->flagAliases.unite(def.flagAliases); + it->flagAliases.insert(def.flagAliases); } else { knownGadgets.insert(def.classname, def.qualified); knownGadgets.insert(def.qualified, def.qualified); |