diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-11-26 10:18:24 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-12-05 11:50:46 +0100 |
commit | d872719bf543a60108db88632d061e343e12b607 (patch) | |
tree | b6fd607503da1bf02b0050bf2e5aac1c4df4197d /src/gui/util | |
parent | 7b34da9ef12554025bb4a8f4750e5807cc37f38c (diff) |
Don't use QHash::unite to merge hashes
QHash::unite can silently turn a regular QHash into a multi hash,
something that is not intended here. Use a regular insert()
instead.
Change-Id: I9244a8553e84eed5367939019347b51491765ea0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qshadergraphloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp index a393e876e0..26848020f2 100644 --- a/src/gui/util/qshadergraphloader.cpp +++ b/src/gui/util/qshadergraphloader.cpp @@ -136,7 +136,7 @@ void QShaderGraphLoader::load() if (prototypesValue.isObject()) { QShaderNodesLoader loader; loader.load(prototypesValue.toObject()); - m_prototypes.unite(loader.nodes()); + m_prototypes.insert(loader.nodes()); } else { qWarning() << "Invalid prototypes property, should be an object"; m_status = Error; |