Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp
This commit is contained in:
con
2009-12-14 11:47:39 +01:00
10 changed files with 220 additions and 473 deletions

View File

@@ -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();
}