Eike Ziller b687658663 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521

2014-04-08 11:18:40 +02:00

..

aggregation

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

changeset

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

cplusplus

C++: fix findusage for member of typedefed anonymous struct

2014-04-04 12:07:06 +02:00

debugger

Merge remote-tracking branch 'origin/3.1'

2014-04-08 11:18:40 +02:00

diff

Ambiguous tests added for differ.

2014-01-16 14:01:50 +01:00

environment

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

extensionsystem

Replace deprecated construct in qbs files.

2014-03-27 13:57:53 +01:00

externaltool

Merge remote-tracking branch 'origin/3.0'

2014-01-08 11:01:06 +01:00

filesearch

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

generichighlighter

GenericHighligher: Preserve whole context on LineContinue

2014-02-05 13:46:44 +01:00

ioutils

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

profilewriter

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

qml

qmljs: generalize language treatement

2014-01-28 15:01:00 +01:00

qtcprocess

QtcProcess: Introduce a QtcProcess::Arguments class

2014-02-19 09:19:28 +01:00

treeviewfind

Tests: Fix compilation of treeviewfind auto tests

2014-01-14 14:37:25 +01:00

utils

Tests: Fix compile

2014-02-03 10:59:24 +01:00

utils_stringutils

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

valgrind

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

auto.pro

Tests: Re-enable qml auto tests

2014-01-06 13:06:19 +01:00

auto.qbs

Add qbs project files for autotests.

2013-09-09 12:16:09 +02:00

autotest.qbs

Support configurable library location in qbs build.

2014-02-28 17:38:41 +01: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