Eike Ziller 227904d4a6 Merge remote-tracking branch 'origin/4.12' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324

2020-05-26 09:00:05 +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.12'

2020-05-26 09:00:05 +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

Android: Fix qbs build

2020-02-12 07:54:59 +00:00