Eike Ziller 99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3

2013-03-18 10:19:14 +01:00

..

commands

QmlDesigner: fix compile for qml2puppet

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

container

QmlDesigner: Type of the propertyname is now PropertyName

2013-03-05 12:34:39 +01: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: Fix compile warning

2013-03-06 15:14:56 +01:00

qml2puppet

Merge remote-tracking branch 'origin/2.7'

2013-03-18 10:19:14 +01:00

qmlpuppet

Fix Krazy warnings about improper include guard in QML debugger.

2013-03-15 13:23:17 +01: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