Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0

Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c

1 files changed, 5 insertions, 6 deletions

diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
index 16653e7f4bc..8a54021a193 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc
@@ -80,13 +80,12 @@
     To clear the background using a color, select \uicontrol Color,
     and select the color in the \uicontrol {Clear Color} field.
 
-    To leave the scene uncleared, select \uicontrol {Unspecified}.
-
-    \section1 Blending Scene Colors
+    To render a Skybox or Skydome instead of clearing the scene,
+    select \uicontrol SkyBox. You can specify the image to use as
+    a value of the \l{SceneEnvironment::lightProbe}{lightProbe}
+    property in \uicontrol {Text Editor}.
 
-    To determine how colors are blended, select a blend mode in the
-    \uicontrol {Blend mode} field. For more information on the options,
-    see \uicontrol {Blending Colors}.
+    To leave the scene uncleared, select \uicontrol {Unspecified}.
 
     \section1 Performing Depth Tests