Eike Ziller 52b7ec058b Merge remote-tracking branch 'origin/4.12' ...

Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6

2020-05-15 14:49:11 +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-15 14:49:11 +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