Oswald Buddenhagen ddea5994f3 Merge remote-tracking branch 'origin/3.5' ...

Conflicts:
	scripts/deployqtHelper_mac.sh

Change-Id: Ia0d5fef8c28e0bfb3b0c703ad3652e2d70d9e7d1

2015-07-17 17:25:26 +02:00

..

instances

QmlDesigner.QmlPuppet: Fix compile for Qt 5.6

2015-07-14 10:28:10 +00:00

Info.plist

Update License

2015-01-16 12:37:56 +01:00

qml2puppet.pri

Use a proper libexec path for Unix builds.

2015-07-09 09:08:01 +00:00

qml2puppet.pro

QmlDesigner: On demand compilation of the puppet

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

qml2puppetmain.cpp

Update License

2015-01-16 12:37:56 +01:00