Eike Ziller 847787f146 Merge remote-tracking branch 'origin/4.7' ...

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664

2018-08-07 09:42:02 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/4.7'

2018-08-07 09:42:02 +02:00

share.pro

Make Creator compile without Qt tools in some configuration

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

share.qbs

Build Qbs QML type info dynamically

2018-02-02 09:14:01 +00:00