Eike Ziller 2485c31a48 Merge remote-tracking branch 'origin/4.15' ...

Conflicts:
	doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc

Change-Id: I906330addb7de31e6ed88f88af3fd2adbbe53e1f

2021-05-31 16:13:47 +02:00

..

build_cmake.yml

Merge remote-tracking branch 'origin/4.15'

2021-05-31 16:13:47 +02:00