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

Merge branch '2.6'

Browse Source 
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
This commit is contained in:
Oswald Buddenhagen
2012-08-30 20:43:02 +02:00
parent e6270852a3 5fdb9f0df9
commit a32e243e61
77 changed files with 916 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/cppchecksymbols.cpp
View File

@@ -485,7 +485,7 @@ bool CheckSymbols::visit(UsingDirectiveAST *)
bool CheckSymbols::visit(EnumeratorAST *ast)
{
addUse(ast->identifier_token, SemanticInfo::StaticUse);
addUse(ast->identifier_token, SemanticInfo::EnumerationUse);
return true;
}
@@ -1163,7 +1163,7 @@ bool CheckSymbols::maybeAddTypeOrStatic(const QList<LookupItem> &candidates, Nam
UseKind kind = SemanticInfo::TypeUse;
if (c->enclosingEnum() != 0)
kind = SemanticInfo::StaticUse;
kind = SemanticInfo::EnumerationUse;
const Use use(line, column, length, kind);
addUse(use);

2
src/plugins/cpptools/cppsemanticinfo.h
View File

@@ -48,7 +48,7 @@ public:
TypeUse,
LocalUse,
FieldUse,
StaticUse,
EnumerationUse,
VirtualMethodUse,
LabelUse,
MacroUse,