Oswald Buddenhagen ae8ac2eb2f Merge branch '2.3' ...

Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e

2011-07-25 13:57:13 +02:00

..

commands

QmlDesigner: Prevent item hoping for reparenting

2011-07-06 18:19:28 +02:00

container

QmlDesigner.instances: allow fallback to item

2011-06-28 13:36:48 +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 branch '2.3'

2011-07-25 13:57:13 +02:00

interfaces

QmlDesigner: Prevent item hoping for reparenting

2011-07-06 18:19:28 +02:00

qml2puppet

QmlDesigner: Prevent item hoping for reparenting

2011-07-06 18:19:28 +02:00

qmlpuppet

QmlDesigner: Fix positioner handling

2011-07-20 13:06:12 +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