diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-26 09:30:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-03 16:28:14 +0100 |
| commit | f8c30759d98603908b408464ea6d98413fc81eec (patch) | |
| tree | ed1f7828c517d9ebafb401fe8955eee45fdc44f1 /src/tools | |
| parent | a9c52dbdf47a6a070b84c8d34ae3c0c29a8ac1e8 (diff) | |
Make the QMultiHash(const QHash &) constructor explicit
And add a QMultiHash::unite(const QHash &) method to avoid
a copy of the data when inserting a QHash into a multi hash.
Change-Id: I864aa9d2b9b7b2c367c3c4d140a2ce2f5408ae09
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 9a1998e764..78829ce93c 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -465,7 +465,7 @@ void Generator::generateCode() // Build extra array // QList<QByteArray> extraList; - QMultiHash<QByteArray, QByteArray> knownExtraMetaObject = knownGadgets; + QMultiHash<QByteArray, QByteArray> knownExtraMetaObject(knownGadgets); knownExtraMetaObject.unite(knownQObjectClasses); for (int i = 0; i < cdef->propertyList.count(); ++i) { |