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

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39

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

..

auto

Merge remote-tracking branch 'origin/2.4'

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

manual

Merge remote-tracking branch 'origin/2.4'

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

qt4projectmanager/test1

Initial import

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

system

Squish: No Symbian target on unix-like systems

2011-11-08 23:55:52 +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