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

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a

2018-02-13 13:37:37 +01:00

..

imports

qbs build: Use project-global destination dir for libs and plugins

2018-02-12 15:34:18 +00:00

modules

Version bump to 4.6-rc1

2018-02-07 11:38:39 +00:00