diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 01:01:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 01:01:28 +0100 |
| commit | 933c47f19bd05325579a5e5b46b910cdbf5947ec (patch) | |
| tree | 5e4fa0e475b46587e61f4640051af27de9034696 /tools | |
| parent | 1196b1ef6c5d2cb05ceba5d6f178dc7e2432ed61 (diff) | |
| parent | e15517def6cc2a78b2fb9bb916d82aa0a32ffc20 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id41f415227f07bb9da8fafc676f4d22ce75544e3
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmllint/scopetree.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qmllint/scopetree.h b/tools/qmllint/scopetree.h index 4b0d4a9539..d6f0a2c171 100644 --- a/tools/qmllint/scopetree.h +++ b/tools/qmllint/scopetree.h @@ -132,7 +132,11 @@ public: ScopeType scopeType() const { return m_scopeType; } - void addMethods(const QHash<QString, MetaMethod> &methods) { m_methods.unite(methods); } + void addMethods(const QHash<QString, MetaMethod> &methods) + { + for (auto it = methods.begin(), end = methods.end(); it != end; ++it) + m_methods.insert(it.key(), it.value()); + } void addMethod(const MetaMethod &method) { m_methods.insert(method.methodName(), method); } QHash<QString, MetaMethod> methods() const { return m_methods; } |