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

..

appwizards

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

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

cplusplus-frontend

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

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

cplusplus-tools

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

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

cppquickfix

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

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

debugger

Merge remote-tracking branch 'origin/2.4'

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

distribution

tests: add a script that runs elflint on all binaries

2009-04-17 09:03:41 +02:00

dockwidgets

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

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

fakevim

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

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

filesystemview/symbolic_links

Don't follow symbolic links in the file system view.

2009-08-31 12:30:54 +02:00

plain-cplusplus

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

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

preprocessor

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

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

process

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

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

progressmanager

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

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

proparser

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

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

qml/testfiles

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

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

qt4projectmanager

Show pro file's subdirectory structure in project tree in non-simple mode.

2009-08-21 14:53:25 +02:00

search

Use the encoding settings when doing multi-file searches.

2010-10-11 14:25:22 +02:00

ssh

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

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

manual.pro

Tests: Make compile.

2011-10-20 16:43:37 +02:00