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

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70

2012-11-09 11:20:10 +01:00

..

ast

Adjust license headers

2012-10-05 17:12:56 +02:00

codeformatter

Merge remote-tracking branch 'origin/2.6'

2012-10-25 10:45:58 +02:00

cxx11

Merge remote-tracking branch 'origin/2.6'

2012-11-09 11:20:10 +01:00

findusages

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

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

lookup

Adjust license headers

2012-10-05 17:12:56 +02:00

misc

Adjust license headers

2012-10-05 17:12:56 +02:00

preprocessor

Tests: C++: Make tests run from shadow builds.

2012-11-07 14:10:24 +01:00

semantic

Merge remote-tracking branch 'origin/2.6'

2012-10-25 10:45:58 +02:00

shared

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00

simplifytypes

Adjust license headers

2012-10-05 17:12:56 +02:00

typeprettyprinter

C++: Compile fixes in tests and tools.

2012-10-23 12:26:47 +02:00

cplusplus.pro

Fix semantic of C++ 11 inline namespaces.

2012-02-03 15:37:17 +01:00