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

Conflicts:
	src/plugins/android/androidconfigurations.cpp
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950

2020-04-20 08:40:54 +02:00

..

config

Doc: Describe Qt Quick Designer 3D editor

2020-03-12 08:40:41 +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 build settings

2020-04-17 08:36:08 +00:00

src

Merge remote-tracking branch 'origin/4.12'

2020-04-20 08:40:54 +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