Eike Ziller 912cd548c0 Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7

2011-11-01 18:16:38 +01:00

..

auto

Merge remote-tracking branch 'origin/2.4'

2011-11-01 18:16:38 +01:00

manual

debugger: disable some unconditional 'throw' in manual test

2011-10-31 16:19:28 +01:00

qt4projectmanager/test1

Initial import

2008-12-02 12:01:29 +01:00

system

Squish: Added function which selects template for new project

2011-11-01 14:48:55 +01:00

tools

QmlJS: Improve tests/tools/qml-ast2dot.

2011-10-20 11:04:03 +02:00

valgrind

Fix Valgrind test compilation.

2011-08-09 14:38:01 +02:00

tests.pro

Add libvalgrind tests.

2011-03-04 12:33:30 +01:00