Eike Ziller 4a826ada04 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

2016-04-22 15:13:58 +02:00

..

instances

Merge remote-tracking branch 'origin/4.0'

2016-04-22 15:13:58 +02:00

Info.plist

Update License according to agreement with Free Qt Foundation

2016-01-19 16:05:29 +00:00

qml2puppet.pri

Support make install also on OS X

2016-04-22 06:46:11 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

2014-04-09 16:01:05 +02:00

qml2puppetmain.cpp

Update License according to agreement with Free Qt Foundation

2016-01-19 16:05:29 +00:00