C++: fix support for typedef of templated typedefs

Fix:
* code completion
* follow symbols
* find usages

Task-number: QTCREATORBUG-8375
Change-Id: I6f35e809ba15f224c5a6d9b2fcfc18dbfba55411
Reviewed-by: Sergey Shambir <[email protected]>
Reviewed-by: Erik Verbruggen <[email protected]>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 029bcee00d4..8a72fc1fc2a 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -690,8 +690,15 @@ bool ResolveExpression::visit(CallAST *ast)
             }
 
         } else if (Function *funTy = ty->asFunctionType()) {
-            if (maybeValidPrototype(funTy, actualArgumentCount))
-                addResult(funTy->returnType().simplified(), scope);
+            if (maybeValidPrototype(funTy, actualArgumentCount)) {
+                LookupItem item;
+                item.setType(funTy->returnType().simplified());
+                item.setScope(scope);
+                // we have to remember a binding because it can be a template instantiation
+                item.setBinding(result.binding());
+
+                _results.append(item);
+            }
 
         } else if (Class *classTy = ty->asClassType()) {
             // Constructor call