diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-11-29 16:22:23 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-24 10:55:10 +0100 |
| commit | a92d64870c02a33193c199ee264a0951361ced7b (patch) | |
| tree | 0a98bde9e26d5beca4cf9ead9e8aac3995e42d40 /src/plugins | |
| parent | 6dce8c470ca9711fc874b32519cefdcca40f149f (diff) | |
Change some unite(const QHash &) to insert(const QHash &)
None of the other code handles it like a multi hash, so let's change the
calls from unite() to insert since we now have an option which won't
silently create a multi hash.
Change-Id: I520295bde81c4ad1b0665308fcaf5fe41c6c3039
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp index a688e98b3f..4702bc3c33 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp @@ -153,7 +153,7 @@ void QQmlProfilerAdapter::receiveData(const QVector<QQmlProfilerData> &new_data, if (locations.isEmpty()) locations = new_locations; else - locations.unite(new_locations); + locations.insert(new_locations); service->dataReady(this); } diff --git a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp index 12c36f3dd6..fb2a28ea01 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp +++ b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp @@ -168,7 +168,7 @@ void QV4ProfilerAdapter::receiveData( if (m_functionLocations.isEmpty()) m_functionLocations = locations; else - m_functionLocations.unite(locations); + m_functionLocations.insert(locations); if (m_functionCallData.isEmpty()) m_functionCallData = functionCallData; |