Eike Ziller d8bd56bcd6 Merge remote-tracking branch 'origin/2.7' into 2.8 ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/qbsprojectmanager/qbscleanstep.cpp
	src/plugins/qbsprojectmanager/qbsnodes.cpp
	src/shared/qbs

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e

2013-05-24 16:20:10 +02:00

..

commands

QmlDesigner: fix compile for qml2puppet

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

container

QmlDesigner: Prepare for other layout items

2013-04-22 17:03:37 +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.6'

2013-01-31 16:25:33 +01:00

interfaces

QmlDesigner: Add content item hack

2013-05-22 14:45:43 +02:00

qml2puppet

Merge remote-tracking branch 'origin/2.7' into 2.8

2013-05-24 16:20:10 +02:00

qmlpuppet

Fix some compiler warnings

2013-05-17 08:13:18 +02: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