Eike Ziller 7ba225cb79 Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf

2018-03-19 13:13:31 +01:00

..

ansiescapecodehandler

Update License according to agreement with Free Qt Foundation

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

fileutils

Update License according to agreement with Free Qt Foundation

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

fuzzymatcher

FuzzyMatcher: Improve tests readability

2017-11-04 16:12:14 +00:00

settings

SettingsAccessor: Rename BasicSettingsAccessor to SettingsAccessor

2018-02-15 13:14:32 +00:00

stringutils

Synchronize autotest defines in qmake and qbs build

2018-03-19 11:50:38 +00:00

templateengine

Synchronize autotest defines in qmake and qbs build

2018-03-19 11:50:38 +00:00

treemodel

TreeModel: Move some base TreeItem code out-of-line

2016-08-03 09:23:46 +00:00

utils.pro

Revert "Utils: Add a ObjectPool convenience class template"

2018-02-21 10:45:32 +00:00

utils.qbs

Revert "Utils: Add a ObjectPool convenience class template"

2018-02-21 10:45:32 +00:00