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

..

data

C++11: Fix bug with parsing ctor initializers.

2012-09-25 11:03:18 +02:00

cxx11.pro

include qttest.pri centrally

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

tst_cxx11.cpp

Merge branch '2.7'

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