Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

commands

QmlDesigner: Test mode for qml puppet streams

2013-07-08 11:28:38 +02:00

container

QmlDesigner: Test mode for qml puppet streams

2013-07-08 11:28:38 +02: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

QmlDesigner: Test mode for qml puppet streams

2013-07-08 11:28:38 +02:00

interfaces

QmlDesigner: Test mode for qml puppet streams

2013-07-08 11:28:38 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00

qmlpuppet

QmlDesigner.QmlPupppet: Keeping the puppet from stealing focus on Mac

2013-07-04 13:02:06 +02:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

qmlpuppet.qrc

QmlDesigner.NodeInstances: Move qmlpuppet to share

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