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

..

imports

Merge remote-tracking branch 'origin/4.5' into 4.6

2018-01-22 12:46:10 +01:00

modules

Merge remote-tracking branch 'origin/4.6'

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