Eike Ziller 99ba300ae3 Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639

2011-08-10 16:03:57 +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 remote-tracking branch 'origin/2.3'

2011-08-10 16:03:57 +02:00

interfaces

QmlDesigner: Prevent item hoping for reparenting

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

qml2puppet

QmlDesigner.NodeInstances: Add version to puppet

2011-07-28 10:14:53 +02:00

qmlpuppet

QmlDesigner.NodeInstances: Add version to puppet

2011-07-28 10:14:53 +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