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

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4

2011-11-18 10:16:49 +01:00

..

auto

QmlJS tests: Move 'basic' codemodel test to QmlJSTools plugin.

2011-11-15 16:11:30 +01:00

manual

debugger: improve qstack manual tests

2011-11-16 16:47:36 +01:00

qt4projectmanager/test1

Initial import

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

system

Squish: Small fix and improvement for indent test

2011-11-17 08:44:39 +01:00

tools

Merge remote-tracking branch 'origin/2.4'

2011-11-11 09:46:25 +01:00

valgrind

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

tests.pro

Add libvalgrind tests.

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