Eike Ziller a55d47544a Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5

2012-09-26 10:01:04 +02:00

..

instances

QmlDesigner.NodeInstances: Fix warning

2012-09-25 16:18:30 +02:00

Info.plist.in

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

main.cpp

rename QtDebug to QDebug

2012-08-06 14:55:08 +02:00

qml2puppet.pro

Merge remote-tracking branch 'origin/2.6'

2012-09-26 10:01:04 +02:00