Eike Ziller a55d47544a Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5

2012-09-26 10:01:04 +02:00

..

commands

QmlDesigner.NodeInstances: Add end puppet command

2012-09-25 14:03:33 +02:00

container

QmlDesigner.Instances: Refactor the qml2 puppet

2012-09-24 11:46:20 +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

interfaces

QmlDesigner.NodeInstances: Fix type registration

2012-09-25 16:18:25 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.6'

2012-09-26 10:01:04 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/2.6'

2012-09-26 10:01:04 +02:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

qmlpuppet.pro

QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails

2011-06-24 16:19:01 +02:00

qmlpuppet.qrc

QmlDesigner.NodeInstances: Move qmlpuppet to share

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