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

..

commands

add/use error channel puppet -> designer

2015-02-18 12:34:10 +00:00

container

Replace assignment of null QString() with a call to clear().

2015-06-16 12:07:31 +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

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

interfaces

QmlPuppet: Compile fix for namespaced Qt

2015-05-19 14:09:46 +00:00

mockfiles

QmlDesigner.Puppet: Adding size hints to Window mockup

2014-09-09 10:38:07 +02:00

qml2puppet

Merge remote-tracking branch 'origin/3.5'

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

qmlprivategate

QmlDesigner.QmlPuppet: Fix compile for Qt 5.6

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

types

Update License

2015-01-16 12:37:56 +01: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