Eike Ziller 11590a8c5f Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7

2015-04-13 10:53:03 +02:00

..

aggregation

Update License

2015-01-16 12:37:56 +01:00

changeset

Update License

2015-01-16 12:37:56 +01:00

cplusplus

C++: Fix preprocessing of comments within function-like macro

2015-03-13 14:34:07 +00:00

debugger

Debugger: Fix parameter passing to LLDB dumper tests

2015-04-02 14:56:32 +00:00

diff

Update License

2015-01-16 12:37:56 +01:00

environment

Update License

2015-01-16 12:37:56 +01:00

extensionsystem

TstPluginspec: fix compilation

2015-04-01 13:03:49 +00:00

externaltool

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

filesearch

Update License

2015-01-16 12:37:56 +01:00

generichighlighter

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

ioutils

qbs build: Introduce convenience project property sharedSourcesDir.

2015-02-18 14:49:06 +00:00

profilewriter

qbs build: Introduce convenience project property sharedSourcesDir.

2015-02-18 14:49:06 +00:00

qml

QmlProjectManager: Remove dependency on qt quick 1 in a test

2015-04-09 14:50:34 +00:00

qtcprocess

Update License

2015-01-16 12:37:56 +01:00

timeline

Timeline: Test parenting of equal start times

2015-04-09 13:41:51 +00:00

treeviewfind

Update License

2015-01-16 12:37:56 +01:00

utils

Tests: Cleanup project files for Utils tests

2015-03-17 09:39:19 +00:00

valgrind

Tests: Fix building

2015-03-17 10:00:35 +00:00

auto.pro

Tests: Move auto/utils_stringutils to auto/utils/stringutils

2015-01-16 13:32:41 +01:00

auto.qbs

qbs build: Add the possibility to include additional autotests.

2015-01-26 12:38:10 +01:00

qttest.pri

Nuke plugins PROVIDER settings

2014-05-08 15:29:11 +02:00

qttestrpath.pri

Nuke plugins PROVIDER settings

2014-05-08 15:29:11 +02:00