Eike Ziller e035ae6df1 Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd

2013-12-18 11:02:16 +01:00

..

commands

QmlDesigner: fix compare operator in DebugOutputCommand

2013-11-13 16:10:48 +01:00

container

Fix build with Qt dev (5.2)

2013-07-18 14:40:03 +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

QmlPuppet: save a few function calls

2013-09-11 10:49:54 +02:00

interfaces

QmlDesigner: Refactor enumeration handling

2013-12-16 12:55:06 +01:00

qml2puppet

Merge remote-tracking branch 'origin/3.0'

2013-12-18 11:02:16 +01:00

qmlpuppet

QmlDesigner: Refactor enumeration handling

2013-12-16 12:55:06 +01:00

types

qmlpuppet: Fix compilation with Qt 4.

2013-12-16 15:22:37 +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