Eike Ziller 1ae483fc83 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c

2016-04-05 14:11:47 +02:00

..

instances

Merge remote-tracking branch 'origin/4.0'

2016-04-05 14:11:47 +02:00

Info.plist

Update License according to agreement with Free Qt Foundation

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

qml2puppet.pri

QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed

2016-03-18 14:17:04 +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