Eike Ziller 6d1cc58697 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a

2014-05-16 16:54:50 +02:00

..

AST.cpp

Rename "[Mm]ethod(s)" to "[Ff]unction(s)"

2013-10-10 15:56:12 +02:00

AST.h

C++: add semantic support for C++11 alias decls.

2013-06-06 14:10:24 +02:00

ASTClone.cpp

C++: add semantic support for C++11 alias decls.

2013-06-06 14:10:24 +02:00

ASTfwd.h

C++: improve support for anonymous classes

2013-04-19 12:14:56 +02:00

ASTMatch0.cpp

C++: improve support for anonymous classes

2013-04-19 12:14:56 +02:00

ASTMatcher.cpp

C++: add semantic support for C++11 alias decls.

2013-06-06 14:10:24 +02:00

ASTMatcher.h

C++: improve support for anonymous classes

2013-04-19 12:14:56 +02:00

ASTPatternBuilder.cpp

remove nokia copyrights from roberto's code

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

ASTPatternBuilder.h

C++: add semantic support for C++11 alias decls.

2013-06-06 14:10:24 +02:00

ASTVisit.cpp

C++: add semantic support for C++11 alias decls.

2013-06-06 14:10:24 +02:00

ASTVisitor.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

ASTVisitor.h

C++: improve support for anonymous classes

2013-04-19 12:14:56 +02:00

Bind.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

Bind.h

C++: fix tooltip for constantValue of enumeratorDeclaration

2013-07-31 14:14:39 +02:00

Control.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Control.h

TypeRewriter: Handle rvalue references correctly

2014-01-03 15:19:08 +01:00

CoreTypes.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

CoreTypes.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

CPlusPlus.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

cplusplus.pri

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

CPlusPlusForwardDeclarations.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

cppassert.h

Incremented year in copyright info

2014-01-08 08:29:47 +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

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

FullySpecifiedType.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Keywords.cpp

C++: Support __thread and thread_local

2013-11-26 09:46:10 +01:00

Keywords.kwgen

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

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

Lexer.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

Lexer.h

C++: Remove Lexer::{tokenOffset(),tokenLength()}

2014-05-15 14:48:03 +02:00

Literals.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Literals.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01: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

Matcher.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Matcher.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

MemoryPool.cpp

C++: Use soft asserts instead of assert()

2013-05-13 14:57:04 +02:00

MemoryPool.h

remove nokia copyrights from roberto's code

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

Name.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Name.h

Fix compilation on Ubuntu 11.10.

2014-03-27 16:25:31 +01:00

Names.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Names.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

NameVisitor.cpp

remove nokia copyrights from roberto's code

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

NameVisitor.h

C++: improve support for anonymous classes

2013-04-19 12:14:56 +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++: Fix weird logic in usage of TopLevelDeclarationProcessor::processDeclaration

2014-03-13 15:41:01 +01:00

Parser.h

C++: Remove dead code in the parser

2014-01-20 16:30:06 +01:00

QtContextKeywords.cpp

C++: Parse MEMBER in Q_PROPERTY()

2013-10-09 15:13:31 +02:00

QtContextKeywords.h

C++: Parse MEMBER in Q_PROPERTY()

2013-10-09 15:13:31 +02:00

SafeMatcher.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

SafeMatcher.h

C++: Fix compilation with C++<11

2014-03-27 20:49:51 +01:00

Scope.cpp

C++: Fix names of functions dealing with enclosing scopes

2013-07-16 08:26:19 +02:00

Scope.h

Added support to C++ symbols rewriting.

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

Symbol.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

Symbol.h

C++: Fix names of functions dealing with enclosing scopes

2013-07-16 08:26:19 +02:00

Symbols.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Symbols.h

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +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

TypeRewriter: Handle rvalue references correctly

2014-01-03 15:19:08 +01:00

Templates.h

C++: Introduce caches to Clone* classes

2013-07-09 18:31:14 +02:00

Token.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

Token.h

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

TranslationUnit.cpp

C++: Clarify units of a Token

2014-05-15 15:55:38 +02:00

TranslationUnit.h

Merge remote-tracking branch 'origin/3.1'

2014-05-16 16:54:50 +02:00

Type.cpp

C++: Do type and name equality checking in a safe manner.

2014-03-27 13:46:55 +01:00

Type.h

Fix compilation on Ubuntu 11.10.

2014-03-27 16:25:31 +01: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