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

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1

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

..

aggregation

Add Qt 5 libraries to .pro files.

2011-11-24 12:02:30 +01:00

changeset

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

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

cplusplus

C++: Move codegen test into the CppTools plugin.

2011-11-15 15:37:29 +01:00

debugger

Compile with Qt 5/Linux.

2011-11-24 12:05:03 +01:00

environment

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

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

extensionsystem

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

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

externaltool

Merge remote-tracking branch 'origin/2.4'

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

fakevim

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

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

filesearch

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

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

generichighlighter

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

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

icheckbuild

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

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

ioutils

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

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

profilewriter

Add Qt 5 libraries to .pro files.

2011-11-24 12:02:30 +01:00

qml

Merge remote-tracking branch 'origin/2.4'

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

qtcprocess

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

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

utils_stringutils

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

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

auto.pro

fix ProWriter test

2011-03-07 22:11:26 +01:00

qttest.pri

Autotests: change to make tests run in-place

2011-02-03 17:56:33 +01:00

qttestrpath.pri

Make extension system tests running again.

2010-11-08 15:12:06 +01:00