Eike Ziller 5c87432260 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

2016-04-12 11:34:46 +02:00

..

commands

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

container

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +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

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

interfaces

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +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/4.0'

2016-04-12 11:34:46 +02:00

qmlprivategate

Merge remote-tracking branch 'origin/4.0'

2016-04-12 11:34:46 +02:00

types

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +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