Oswald Buddenhagen 6fb94a7b10 Merge branch '2.7' ...

Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88

2013-05-15 10:21:47 +02:00

..

ast

CPlusPlus: fixed parsing function-try-catch with ctor-initializer

2013-04-09 11:31:28 +02:00

checksymbols

C++: fix highlighting type when there is using Namespace::Class

2013-05-02 15:17:27 +02:00

codeformatter

include qttest.pri centrally

2013-04-02 17:11:37 +02:00

cxx11

Merge branch '2.7'

2013-05-15 10:21:47 +02:00

findusages

C++: fix highlighting type when there is using Namespace::Class

2013-05-02 15:17:27 +02:00

lexer

fix include style relating to cplusplus libraries

2013-04-03 13:40:39 +02:00

lookup

fix include style relating to cplusplus libraries

2013-04-03 13:40:39 +02:00

misc

fix include style relating to cplusplus libraries

2013-04-03 13:40:39 +02:00

preprocessor

Merge remote-tracking branch 'origin/2.7'

2013-04-30 11:43:33 +02:00

semantic

C++: handle non-arguments in function parameter scope gracefuly

2013-04-09 11:49:00 +02:00

shared

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

simplifytypes

include qttest.pri centrally

2013-04-02 17:11:37 +02:00

typeprettyprinter

fix include style relating to cplusplus libraries

2013-04-03 13:40:39 +02:00

cplusplus.pro

C++: Fix highlighting of doxygen's "///"

2013-02-19 10:17:55 +01:00