Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libs/cplusplus/CheckUndefinedSymbols.cpp b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
index ee5d76bf7e..3d99353395 100644
--- a/src/libs/cplusplus/CheckUndefinedSymbols.cpp
+++ b/src/libs/cplusplus/CheckUndefinedSymbols.cpp
@@ -79,6 +79,12 @@ QByteArray CheckUndefinedSymbols::templateParameterName(DeclarationAST *ast) con
             return templateParameterName(d->name);
         else if (TemplateTypeParameterAST *d = ast->asTemplateTypeParameter())
             return templateParameterName(d->name);
+        else if (ParameterDeclarationAST *d = ast->asParameterDeclaration()) {
+            if (d->symbol) {
+                if (const Identifier *id = d->symbol->identifier())
+                    return QByteArray::fromRawData(id->chars(), id->size());
+            }
+        }
     }
     return QByteArray();
 }