diff options
author | Christian Stenger <christian.stenger@qt.io> | 2019-07-31 09:57:39 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2019-07-31 08:05:04 +0000 |
commit | 3163ed4feb917f2cc32a4ed979eb18982383e025 (patch) | |
tree | 87b202ce495dc9ad577bea1d9fccfa9878906153 /src/plugins/qmljstools | |
parent | f4f86078a5974de2f07a7bb2fd0af98cafcd3d94 (diff) |
QmlJSTools: Fix compile
Needed because of conflicting patches went in
nearly at the same time.
Change-Id: I042637438d1b4e412ae39bc2e8bc5e1aa24527dc
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/qmljstools')
-rw-r--r-- | src/plugins/qmljstools/qmljsfunctionfilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index adb79d6efd..d9a2600263 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -66,8 +66,8 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor( if (!regexp.isValid()) return {}; - const QHash<QString, QList<LocatorData::Entry> > entries = m_data->entries(); - for (const QList<LocatorData::Entry> &items : entries) { + const QHash<QString, QList<LocatorData::Entry> > locatorEntries = m_data->entries(); + for (const QList<LocatorData::Entry> &items : locatorEntries) { if (future.isCanceled()) break; |