Eike Ziller 7931159c09 Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986

2012-03-21 09:57:56 +01:00

..

ast

[C++] Add error recovery for namespace declarations.

2012-02-28 10:22:31 +01:00

codeformatter

Long live the king!

2012-01-26 19:55:36 +01:00

cxx11

Removed module names from #include directives.

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

findusages

Long live the king!

2012-01-26 19:55:36 +01:00

lookup

Long live the king!

2012-01-26 19:55:36 +01:00

misc

Revert "Editor: Highlight background for whitespaces in strings and comments"

2012-02-03 11:52:01 +01:00

preprocessor

Preprocessor: fix line for generated code.

2012-03-19 10:48:43 +01:00

semantic

Added test for lambda function definitions.

2012-03-20 14:28:51 +01:00

shared

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

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

simplifytypes

Removed module names from #include directives.

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

typeprettyprinter

Long live the king!

2012-01-26 19:55:36 +01:00

cplusplus.pro

Fix semantic of C++ 11 inline namespaces.

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