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

Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6

2018-02-01 09:58:36 +01:00

..

copyable_resource

qbs build: Get rid of CopyTransformer.

2014-07-17 13:08:30 +02:00

libclang

qbs build: Fix clang Probe

2018-01-25 15:36:24 +00:00

pluginjson

qbs build: Support new variable QTCREATOR_COPYRIGHT_YEAR

2017-08-24 13:10:24 +00:00

qbsbuildconfig

qbs build: Disable Qt bundling functionality

2018-01-30 10:56:14 +00:00

qtc

Merge remote-tracking branch 'origin/4.6'

2018-01-23 17:06:59 +01:00