Eike Ziller 64b19af7dd Merge remote-tracking branch 'origin/4.3' ...

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

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d

2017-05-15 15:31:55 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/4.3'

2017-05-15 15:31:55 +02:00

share.pro

Make Creator compile without Qt tools in some configuration

2017-02-10 13:30:53 +00:00

share.qbs

Fix qbs build on macOS

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