Eike Ziller 423ea729f8 Merge remote-tracking branch 'origin/4.13' into master ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportoptions.cpp

Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef

2020-09-23 10:11:44 +02:00

..

applications

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

metainfo

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

qtcreator

Merge remote-tracking branch 'origin/4.13' into master

2020-09-23 10:11:44 +02:00

CMakeLists.txt

CMake build/Linux: Install desktop and appstream files

2020-04-30 07:06:20 +00:00

share.pro

Make Creator compile without Qt tools in some configuration

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

share.qbs

Shared: Do not copy or install binary artifacts

2020-08-04 12:52:58 +00:00