feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
This commit is contained in:
Eike Ziller
2012-09-11 14:02:03 +02:00
parent d09b83c28d fa094b2261
commit 5ac721dd58
156 changed files with 3503 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/3rdparty/cplusplus/Bind.cpp vendored
View File

@@ -2098,7 +2098,16 @@ bool Bind::visit(ExceptionDeclarationAST *ast)
}
DeclaratorIdAST *declaratorId = 0;
type = this->declarator(ast->declarator, type, &declaratorId);
const Name *argName = 0;
if (declaratorId && declaratorId->name)
argName = declaratorId->name->name;
Argument *arg = control()->newArgument(location(declaratorId, ast->firstToken()), argName);
arg->setType(type);
_scope->addMember(arg);
// unsigned dot_dot_dot_token = ast->dot_dot_dot_token;
return false;
}