Eike Ziller fcc6b11230 Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Iaff42d30008db13ecb685e5157c82292fe48b038

2015-04-01 11:53:26 +02:00

..

commands

add/use error channel puppet -> designer

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

container

QmlDesigner.Instances: use TypeName instead of QString

2015-02-16 09:43:41 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

images

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

instances

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

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

interfaces

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

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

mockfiles

QmlDesigner.Puppet: Adding size hints to Window mockup

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

qml2puppet

QmlPuppet: Fix building on demand on OSX

2015-04-01 08:37:22 +00:00

qmlpuppet

Remove a few unneeded "QT += script"s

2015-04-01 08:55:16 +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