Eike Ziller 81cce8902e Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac

2011-10-28 10:17:44 +02:00

..

ast

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

codeformatter

C++ indenter: Accept attributes in access specifiers.

2011-10-11 12:45:04 +02:00

codegen

Fix tests/auto/cplusplus/codegen on windows.

2011-10-20 11:44:15 +02:00

findusages

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

lookup

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

misc

CDB breakpoints: Fix line adjustment in case statements.

2011-10-04 09:35:45 +02:00

preprocessor

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

semantic

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

shared

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

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

simplifytypes

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

typeprettyprinter

C++: Fix function return type printing.

2011-09-12 11:16:39 +02:00

cplusplus.pro

Added tests for the DiagnosticClient.

2011-02-17 11:20:50 +01:00