diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-11-29 12:13:49 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-12-12 15:25:47 +0100 |
| commit | 40f28b1a8afbe15da369db53cda3dadd8d11ee43 (patch) | |
| tree | b1124b06aa785c66aabbe49f9fdf9156781a3af1 /src/dbus | |
| parent | 6f5556e7b4d5d388805d06d852b5cdb7c52e80dd (diff) | |
Don't use QMap::unite for merging maps
Other code using these maps are not treating them like multi-maps
Change-Id: I3381fde3b3612a29110cfe890f20f96f3c0bd3a2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 74e17ced77..3c529ab755 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -631,10 +631,10 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con QDBusIntrospection::Interface merged = *it.value().constData(); for (++it; it != end; ++it) { - merged.annotations.unite(it.value()->annotations); + merged.annotations.insert(it.value()->annotations); merged.methods.unite(it.value()->methods); merged.signals_.unite(it.value()->signals_); - merged.properties.unite(it.value()->properties); + merged.properties.insert(it.value()->properties); } merged.name = QLatin1String("local.Merged"); |