Fixed the global completion to include the injected class name and user types.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 997707edf7..635bf9e7b0 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -941,7 +941,7 @@ void CppCodeCompletion::globalCompletion(Scope *currentScope)
             if (symbols.first()->isNamespace())
                 completeNamespace(currentBinding);
             else
-                completeClass(currentBinding, false);
+                completeClass(currentBinding);
         }
     }
 
@@ -1440,6 +1440,8 @@ void CppCodeCompletion::completeClass(ClassOrNamespace *b, bool staticLookup)
 
             scopesVisited.insert(scope);
 
+            addCompletionItem(scope->owner()); // add a completion item for the injected class name.
+
             for (Scope::iterator it = scope->firstSymbol(); it != scope->lastSymbol(); ++it) {
                 Symbol *member = *it;
                 if (member->isFriend())