Eike Ziller 112bdc0f88 Merge remote-tracking branch 'origin/4.1' ...

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

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28

2016-08-15 14:42:47 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/4.1'

2016-08-15 14:42:47 +02:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Fix qbs build on macOS

2016-07-28 14:45:12 +00:00