diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp
index a97c71ec5c6..1f082a6ec8b 100644
--- a/src/libs/3rdparty/cplusplus/Bind.cpp
+++ b/src/libs/3rdparty/cplusplus/Bind.cpp
@@ -2388,9 +2388,11 @@ bool Bind::visit(TypenameTypeParameterAST *ast)
     // unsigned dot_dot_dot_token = ast->dot_dot_dot_token;
     const Name *name = this->name(ast->name);
     ExpressionTy type_id = this->expression(ast->type_id);
+    CPlusPlus::Kind classKey = translationUnit()->tokenKind(ast->classkey_token);
 
     TypenameArgument *arg = control()->newTypenameArgument(sourceLocation, name);
     arg->setType(type_id);
+    arg->setClassDeclarator(classKey == T_CLASS);
     ast->symbol = arg;
     _scope->addMember(arg);
     return false;
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp
index 6a69ca2dc4e..253bb047885 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.cpp
+++ b/src/libs/3rdparty/cplusplus/Symbols.cpp
@@ -171,11 +171,13 @@ void Argument::visitSymbol0(SymbolVisitor *visitor)
 
 TypenameArgument::TypenameArgument(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name)
     : Symbol(translationUnit, sourceLocation, name)
+    , _isClassDeclarator(false)
 { }
 
 TypenameArgument::TypenameArgument(Clone *clone, Subst *subst, TypenameArgument *original)
     : Symbol(clone, subst, original)
     , _type(clone->type(original->_type, subst))
+    , _isClassDeclarator(original->_isClassDeclarator)
 { }
 
 TypenameArgument::~TypenameArgument()
diff --git a/src/libs/3rdparty/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h
index a545644cfa7..4cd8141beb1 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.h
+++ b/src/libs/3rdparty/cplusplus/Symbols.h
@@ -187,6 +187,8 @@ public:
     virtual ~TypenameArgument();
 
     void setType(const FullySpecifiedType &type);
+    void setClassDeclarator(bool isClassDecl) { _isClassDeclarator = isClassDecl; }
+    bool isClassDeclarator() const { return _isClassDeclarator; }
 
     // Symbol's interface
     virtual FullySpecifiedType type() const;
@@ -202,6 +204,7 @@ protected:
 
 private:
     FullySpecifiedType _type;
+    bool _isClassDeclarator;
 };
 
 class CPLUSPLUS_EXPORT Block: public Scope