Eike Ziller bedc477943 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104

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

..

data

C++: Core changes in preprocessing

2012-06-25 15:49:27 +02:00

preprocessor.pro

include qttest.pri centrally

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

tst_preprocessor.cpp

Merge remote-tracking branch 'origin/2.7'

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