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

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300

2011-07-15 14:29:07 +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-07-15 14:29:07 +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.NodeInstances: Add workaround for simulator Qt

2011-07-15 10:45:10 +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