Eike Ziller d18d7eaef6 Merge remote-tracking branch 'origin/3.6' ...

Change-Id: I4e1ec4054d7364057c63e63e293a246e64afdddb

2016-01-25 13:21:18 +01:00

..

commands

Update License according to agreement with Free Qt Foundation

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

container

Update License according to agreement with Free Qt Foundation

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

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

instances

Update License according to agreement with Free Qt Foundation

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

interfaces

Update License according to agreement with Free Qt Foundation

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

mockfiles

Update License according to agreement with Free Qt Foundation

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

qml2puppet

Merge remote-tracking branch 'origin/3.6'

2016-01-25 13:21:18 +01:00

qmlprivategate

Revert "QmlDesigner: call directly the invalidate method"

2016-01-21 12:15:08 +00:00

types

Update License according to agreement with Free Qt Foundation

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

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlDesigner: read window mock from file

2014-07-30 13:44:01 +02:00