Oswald Buddenhagen 777ca8e655 Merge remote-tracking branch 'origin/4.5' ...

Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f

2017-12-21 13:20:24 +01:00

..

aggregation

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

algorithm

Utils::transform: Add support for various map types as result

2017-12-20 09:58:50 +00:00

changeset

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

clangstaticanalyzer

Tests: Define SRCDIR for clang static analyzer tests only where necessary

2017-02-14 14:34:13 +00:00

cplusplus

C++: Fix crash with invalid raw string literal

2017-09-20 07:38:04 +00:00

debugger

Merge remote-tracking branch 'origin/4.5'

2017-12-21 13:20:24 +01:00

diff

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

environment

Environment: Keep case of environment variables on windows

2017-09-19 11:37:03 +00:00

extensionsystem

Auto Tests: Fix extensionsystem tests

2017-04-19 06:39:37 +00:00

externaltool

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

filesearch

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

flamegraph

Move flame graph view from QmlProfiler to separate library

2016-07-20 08:55:28 +00:00

generichighlighter

SyntaxHighligher: Remove the need to specify format for spaces

2017-05-23 08:34:53 +00:00

json

qbs build: Do not access the bundle module unconditionally

2017-08-03 11:09:55 +00:00

mapreduce

Reduce CPU load of test parsing

2017-05-16 10:46:13 +00:00

profilewriter

Remove spaces in initializer lists

2017-02-22 16:25:09 +00:00

qml

Tests: Fix qml import check

2017-12-19 13:51:35 +00:00

qtcprocess

Tests: Fix compile

2017-06-21 13:34:36 +00:00

runextensions

runextensions: Add convenience method for result handler

2016-10-31 09:31:02 +00:00

sdktool

qbs build: Introduce new module "qtc".

2016-06-08 08:46:00 +00:00

timeline

Reduce usage of qApp in favor of static function calls

2017-04-24 18:36:28 +00:00

toolchaincache

GccToolChain: Improve retrieval/caching of compiler data

2017-10-27 15:11:28 +00:00

treeviewfind

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

utils

SettingsAccessor: Add setters to VersionUpgrader

2017-11-30 10:40:53 +00:00

valgrind

Valgrind: Merge ValgrindRunner and ValgrindProcess

2017-06-30 10:33:51 +00:00

auto.pro

GccToolChain: Improve retrieval/caching of compiler data

2017-10-27 15:11:28 +00:00

auto.qbs

GccToolChain: Improve retrieval/caching of compiler data

2017-10-27 15:11:28 +00:00

qttest.pri

Fix autotests build.

2016-03-22 14:19:07 +00:00

qttestrpath.pri

Nuke plugins PROVIDER settings

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