Merge remote-tracking branch 'origin/qds-1.59'

 Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68

2 files changed, 19 insertions, 2 deletions

diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index cfd19be883..361514e053 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -42,6 +42,7 @@
     \list
         \li \l{DirectionalLight}{Light Directional}
         \li \l{PointLight}{Light Point}
+        \li \l{SpotLight}{Light Spot}
         \li \l{AreaLight}{Light Area}
     \endlist
 
@@ -121,6 +122,22 @@
     Aside from fade, a point light has the same properties as a directional
     light.
 
+    \section1 Spot Light
+
+    A spot light emits light towards one direction in a cone shape.
+    The light intensity diminishes when approaching the value of the
+    \uicontrol {Cone angle} property. The angle at which the light
+    intensity starts to diminish is defined by the
+    \uicontrol {Inner cone angle} property. Both angles are defined in degrees.
+
+    Inside the inner cone angle, the spot light behaves similarly to the point
+    light. There the light intensity diminishes according to inverse-square-law.
+    However, the fade-off (and range) can be controlled with the
+    \uicontrol {Constant fade}, \uicontrol {Linear fade}, and
+    \uicontrol {Quadratic fade} properties.
+
+    \image studio-3d-spot-light.png
+
     \section1 Area Light
 
     An area light is similar to the directional light. However, instead of
@@ -135,7 +152,7 @@
     The image below shows an example on how to light an object with different
     colors using two different area lights.
 
-    \image area-light.png
+    \image studio-3d-area-light.png
 
     You can rotate, scale, and move area lights.
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
index bcef409407..54873e84d5 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -159,7 +159,7 @@
     an easy way to add a high-quality look at a relatively low cost.
 
     To specify an image to use as the specular reflection map, set the
-    \uicontrol {Light probe} property
+    \uicontrol {Light probe} property.
 
     Crisp images cause your material to look very glossy. The more you
     blur your image, the softer your material appears.