Eike Ziller 387f5a7006 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63

2012-11-26 10:52:28 +01:00

..

AST.cpp

Merge remote-tracking branch 'origin/2.6'

2012-11-26 10:52:28 +01:00

AST.h

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

ASTClone.cpp

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

ASTfwd.h

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

ASTMatch0.cpp

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

ASTMatcher.cpp

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

ASTMatcher.h

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

ASTPatternBuilder.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

ASTPatternBuilder.h

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

ASTVisit.cpp

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

ASTVisitor.cpp

C++: Add support for C++11 range-based 'for' loops

2012-02-21 15:27:00 +01:00

ASTVisitor.h

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

Bind.cpp

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

Bind.h

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

Control.cpp

Merge remote-tracking branch 'origin/2.6'

2012-08-23 15:52:15 +02:00

Control.h

Added support for override/final and enum classes

2012-07-30 09:42:30 +02:00

CoreTypes.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

CoreTypes.h

C++: Introduce unicode char/strings support

2012-06-06 14:55:07 +02:00

CPlusPlus.h

Added support to C++ symbols rewriting.

2011-05-17 11:45:47 +02:00

cplusplus.pri

Added support to C++ symbols rewriting.

2011-05-17 11:45:47 +02:00

CPlusPlusForwardDeclarations.h

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

DiagnosticClient.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

DiagnosticClient.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

FullySpecifiedType.cpp

Added support for override/final and enum classes

2012-07-30 09:42:30 +02:00

FullySpecifiedType.h

Added support for override/final and enum classes

2012-07-30 09:42:30 +02:00

Keywords.cpp

C++11: Add the alignof and alignas tokens.

2012-09-17 14:02:55 +02:00

Keywords.kwgen

move src/shared/cplusplus/ -> src/libs/3rdparty/cplusplus/

2011-05-16 11:05:30 +02:00

Lexer.cpp

C++: Introduce C++11 raw string literals

2012-08-23 14:35:02 +02:00

Lexer.h

C++: Introduce C++11 raw string literals

2012-08-23 14:35:02 +02:00

Literals.cpp

C++: Fix compilation of plain-cplusplus test on OSX.

2011-11-29 11:12:03 +01:00

Literals.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

LiteralTable.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

LiteralTable.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

MemoryPool.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

MemoryPool.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

Name.cpp

C++: fix member rewriting when doing template instantiation.

2012-10-11 16:13:32 +02:00

Name.h

C++: fix member rewriting when doing template instantiation.

2012-10-11 16:13:32 +02:00

Names.cpp

C++: handle destructor names with template parameters.

2012-02-23 08:39:34 +01:00

Names.h

C++: handle destructor names with template parameters.

2012-02-23 08:39:34 +01:00

NameVisitor.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

NameVisitor.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

ObjectiveCAtKeywords.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

ObjectiveCTypeQualifiers.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

ObjectiveCTypeQualifiers.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

Parser.cpp

C++: Store lambda captures in the code model.

2012-11-07 13:36:20 +01:00

Parser.h

C++11: More (expression-list) or brace-init-list.

2012-09-19 12:23:18 +02:00

QtContextKeywords.cpp

C++ parser: Don't fail on REVISION in Q_PROPERTY.

2011-10-25 14:30:03 +02:00

QtContextKeywords.h

C++ parser: Don't fail on REVISION in Q_PROPERTY.

2011-10-25 14:30:03 +02:00

Scope.cpp

Added support to C++ symbols rewriting.

2011-05-17 11:45:47 +02:00

Scope.h

Added support to C++ symbols rewriting.

2011-05-17 11:45:47 +02:00

Symbol.cpp

C++: Fix a crash in debug builds when rewriting functions.

2011-10-25 11:32:18 +02:00

Symbol.h

C++: Fix a crash in debug builds when rewriting functions.

2011-10-25 11:32:18 +02:00

Symbols.cpp

C++11: Correct scoping for scoped enums.

2012-10-31 15:09:06 +01:00

Symbols.h

C++11: Correct scoping for scoped enums.

2012-10-31 15:09:06 +01:00

SymbolVisitor.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

SymbolVisitor.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

Templates.cpp

Fix compilation on Windows

2012-10-11 20:05:17 +02:00

Templates.h

C++: fix member rewriting when doing template instantiation.

2012-10-11 16:13:32 +02:00

Token.cpp

C++11: Add the alignof and alignas tokens.

2012-09-17 14:02:55 +02:00

Token.h

C++11: Add the alignof and alignas tokens.

2012-09-17 14:02:55 +02:00

TranslationUnit.cpp

C++11: Fix use of >> in template arguments.

2012-09-19 11:58:34 +02:00

TranslationUnit.h

C++11: Fix use of >> in template arguments.

2012-09-19 11:58:34 +02:00

Type.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

Type.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

TypeMatcher.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

TypeMatcher.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

TypeVisitor.cpp

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00

TypeVisitor.h

remove nokia copyrights from roberto's code

2011-05-16 11:05:30 +02:00