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

..

config

Doc: Fix links to QtAndroid functions

2020-04-20 11:56:50 +00:00

doxygen

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00

examples

Doc: Update widget-based app tutorial

2020-04-14 10:54:55 +00:00

images

Doc: Update info about States view

2020-05-12 15:06:15 +00:00

src

Merge remote-tracking branch 'origin/4.12'

2020-05-15 14:49:11 +02:00

qtcreator-online.qdocconf

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00

qtcreator.qdocconf

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00