Ulf Hermann 5b8989d017 Merge remote-tracking branch 'origin/4.7' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I31edd50b2301f4d9b64e1c7980c4ed371e00c2dc

2018-07-25 14:19:14 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/4.7'

2018-07-25 14:19:14 +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