Eike Ziller 4704f49fbb Merge remote-tracking branch 'origin/4.9' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b

2019-05-28 14:01:01 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/4.9'

2019-05-28 14:01:01 +02:00

CMakeLists.txt

Qt Creator CMake port

2019-05-17 13:33:28 +00:00

share.pro

Make Creator compile without Qt tools in some configuration

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

share.qbs

SharedContent: Update share.qbs

2019-04-02 08:28:26 +00:00