Eike Ziller 8b8ecfa28f Merge remote-tracking branch 'origin/4.12' ...

Conflicts:
	src/plugins/cmakeprojectmanager/fileapiparser.cpp

Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165

2020-06-15 11:30:34 +02:00

..

config

Doc: Fix naming of .index files

2020-05-25 08:50:54 +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

Add Android services to the manifest editor documentation

2020-06-08 13:44:20 +00:00

src

Merge remote-tracking branch 'origin/4.12'

2020-06-15 11:30:34 +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