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

..

instances

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

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

Info.plist.in

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

main.cpp

QmlDesigner.qml2puppet: Adding simple test

2013-05-06 12:54:40 +02:00

qml2puppet.pri

Fix compilation for Mac OS X

2013-04-17 11:23:33 +02:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

2013-03-06 15:41:04 +01:00