Eike Ziller 38b61177f6 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692

2013-04-23 11:13:25 +02:00

..

commands

QmlDesigner: fix compile for qml2puppet

2013-02-07 12:45:02 +01:00

container

QmlDesigner: Prepare for other layout items

2013-04-22 17:03:37 +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

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

interfaces

QmlDesigner: Prepare for other layout items

2013-04-22 17:03:37 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.7'

2013-04-23 11:13:25 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/2.7'

2013-04-23 11:13:25 +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