Merge remote-tracking branch 'origin/4.12'

Change-Id: I4935b6afdb13627f32e850a4c8b536de0269bc4b

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp
index 839e3fd19f..5cfa28c609 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.cpp
+++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp
@@ -187,7 +187,7 @@ class ProcessProperties: private MemberProcessor
     QSet<const ObjectValue *> _processed;
     bool _globalCompletion = false;
     bool _enumerateGeneratedSlots = false;
-    bool _enumerateSlots = true;
+    bool _enumerateMethods = true;
     const ScopeChain *_scopeChain;
     const ObjectValue *_currentObject = nullptr;
     PropertyProcessor *_propertyProcessor = nullptr;
@@ -208,9 +208,9 @@ public:
         _enumerateGeneratedSlots = enumerate;
     }
 
-    void setEnumerateSlots(bool enumerate)
+    void setEnumerateMethods(bool enumerate)
     {
-        _enumerateSlots = enumerate;
+        _enumerateMethods = enumerate;
     }
 
     void operator ()(const Value *value, PropertyProcessor *processor)
@@ -251,14 +251,14 @@ private:
 
     bool processSignal(const QString &name, const Value *value) override
     {
-        if (_globalCompletion)
+        if (_globalCompletion || _enumerateMethods)
             process(name, value);
         return true;
     }
 
     bool processSlot(const QString &name, const Value *value) override
     {
-        if (_enumerateSlots)
+        if (_enumerateMethods)
             process(name, value);
         return true;
     }
@@ -771,7 +771,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const AssistInterface *
             ProcessProperties processProperties(&scopeChain);
             processProperties.setGlobalCompletion(true);
             processProperties.setEnumerateGeneratedSlots(true);
-            processProperties.setEnumerateSlots(false);
+            processProperties.setEnumerateMethods(false);
 
             // id: is special
             AssistProposalItem *idProposalItem = new QmlJSAssistProposalItem;