Merge remote-tracking branch 'origin/5.0' into 6.0

Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I87b19a51b1950d19eff95086848b0728ba2f0ebd
2021-10-08 15:58:02 +02:00
parent e454c91838 7c2121bcfd
commit 7bb21fcfff
5 changed files with 43 additions and 14 deletions
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -60,7 +60,7 @@
        \li More Information

    \row
-        \li \inlineimage spot.png
+        \li \inlineimage directional.png
        \li Directional Light
        \li
        \li \l{DirectionalLight}{Light Directional}