Eike Ziller ab0c3da08f Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e

2013-07-11 08:02:41 +02:00

..

aggregation

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

changeset

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

cplusplus

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-09 11:04:59 +02:00

debugger

Debugger: Remove QByteArrayData dumper test also in master branch

2013-07-10 09:15:59 +02:00

diff

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

environment

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

extensionsystem

Tests: Allow execution from outside pluginmanager folder

2013-06-20 11:21:00 +02:00

externaltool

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

filesearch

Fix searching for repeated characters in files.

2013-06-25 10:03:42 +02:00

generichighlighter

remove redundant INCLUDEPATHs

2013-04-02 17:10:07 +02:00

ioutils

Tests: Remove unneeded define

2013-04-02 15:15:43 +02:00

profilewriter

implement simple VFS to support caching during project parsing

2013-06-04 15:42:13 +02:00

qml

Remove unreachable link

2013-07-04 13:08:30 +02:00

qtcprocess

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

treeviewfind

Now really fix the treeviewfind test for 2.7

2013-04-19 12:50:41 +02:00

utils

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

utils_stringutils

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

valgrind

Fix valgrind tests

2013-04-11 17:02:05 +02:00

auto.pro

Merge remote-tracking branch 'origin/2.7'

2013-04-18 09:22:19 +02:00

qttest.pri

Tests: Exclude QT_NO_CAST_FROM_ASCII

2013-01-17 10:02:22 +01:00

qttestrpath.pri

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00