Doc: Update info on the Library view

- Fix the paths to sections in Library
- Update pictures where needed
- Use "component" instead of "item", "object", or "QML type"
- Add links to the new topics for Design views
- Other minor improvements

Fixes: QDS-3879
Change-Id: I464fbe2db2f5045bdc04a70ea5feb5050ec22c18
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

31 files changed, 181 insertions, 231 deletions

diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 519743729d..2c9d26bb34 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -146,12 +146,11 @@
                                     \li \l{Exporting from Maya}{Maya}
                                 \endlist
                             \li \l{Importing 3D Assets}
-                            \li \l{Editing 3D Assets in Design Mode}
                             \li \l{Adding 3D Views}
                             \li \l{Using 3D Components}
                             \list
                                 \li \l{Setting Group Properties}
-                                \li \l{Adding Models}
+                                \li \l{Adding 3D Models}
                                 \li \l{Using Materials and Shaders}
                                 \li \l{Attaching Textures to Materials}
                                 \li \l{Using 3D Materials}
diff --git a/doc/qtdesignstudio/images/studio-3d-models.png b/doc/qtdesignstudio/images/studio-3d-models.png
new file mode 100644
index 0000000000..6f2dfc6812
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-models.png
diff --git a/doc/qtdesignstudio/images/studio-3d-properties-type.png b/doc/qtdesignstudio/images/studio-3d-properties-type.png
index 1bdcadf4f9..3b171820c0 100644
--- a/doc/qtdesignstudio/images/studio-3d-properties-type.png
+++ b/doc/qtdesignstudio/images/studio-3d-properties-type.png
diff --git a/doc/qtdesignstudio/images/studio-navigator-view3d.png b/doc/qtdesignstudio/images/studio-navigator-view3d.png
index 9c5bab7f8c..1fa65c10dc 100644
--- a/doc/qtdesignstudio/images/studio-navigator-view3d.png
+++ b/doc/qtdesignstudio/images/studio-navigator-view3d.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-components.png b/doc/qtdesignstudio/images/studio-qtquick-3d-components.png
index c256af07b5..ccf4ea0b37 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-components.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-components.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.png b/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.png
index 16d2ae2d39..627561fd59 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-default-material.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.png b/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.png
index ae2c1ba00b..32008885ce 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-material-texture.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-material.png b/doc/qtdesignstudio/images/studio-qtquick-3d-material.png
index 0b4524793b..597f47e22b 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-material.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-material.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-model.png b/doc/qtdesignstudio/images/studio-qtquick-3d-model.png
index fa9422a26f..94dd662ea4 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-model.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-model.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.png b/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.png
index cc12bfd55f..3f0225dff4 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-texture-properties.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-texture.png b/doc/qtdesignstudio/images/studio-qtquick-3d-texture.png
index 45bc14380e..6165d74b1c 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-texture.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-texture.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-view.png b/doc/qtdesignstudio/images/studio-qtquick-3d-view.png
index 6e96bd5bf6..9cba7fcd1a 100644
--- a/doc/qtdesignstudio/images/studio-qtquick-3d-view.png
+++ b/doc/qtdesignstudio/images/studio-qtquick-3d-view.png
diff --git a/doc/qtdesignstudio/images/studio-qtquick-camera-properties.png b/doc/qtdesignstudio/images/studio-qtquick-camera-properties.png
new file mode 100644
index 0000000000..8209b39fd7
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-qtquick-camera-properties.png
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 709472a5e1..f45f090890 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -128,12 +128,11 @@
             \endlist
         \li \l{Editing 3D Scenes}
                 \list
-                    \li \l{Editing 3D Assets in Design Mode}
                     \li \l{Adding 3D Views}
                     \li \l{Using 3D Components}
                     \list
                        \li \l{Setting Group Properties}
-                       \li \l{Adding Models}
+                       \li \l{Adding 3D Models}
                        \li \l{Using Materials and Shaders}
                        \li \l{Attaching Textures to Materials}
                        \li \l{Using 3D Materials}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 42862036ed..699a33d28c 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -83,7 +83,6 @@
         \row
             \li \b {\l{Editing 3D Scenes}}
                 \list
-                    \li \l{Editing 3D Assets in Design Mode}
                     \li \l{3D Editor}
                     \li \l{Adding 3D Views}
                     \li \l{Using 3D Components}
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
index cd5ef0566d..8ee02452f9 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -35,9 +35,20 @@
     A camera is always necessary to view the content of a 3D scene. A camera
     defines how to project the content of a 3D scene into a 2D coordinate space,
     which can then be used on a 2D surface. When a camera is present in the
-    scene, it can be used to direct what is displayed in a 3D view.
+    scene, it can be used to direct what is displayed in a \l {Adding 3D Views}
+    {3D view}.
 
-    You can use the following 3D QML types to determine camera projection:
+     \image studio-qtquick-3d-components.png "Qt Quick 3D components in Library"
+
+    You can add a camera to your scene by dragging-and-dropping one from
+    \l Library > \uicontrol Components > \uicontrol QtQuick3D > \uicontrol
+    {Qt Quick 3D} to \l {3D Editor} or to a 3D view in \l Navigator.
+    If the cameras are not displayed in \uicontrol Library, you should add the
+    \uicontrol QtQuick3D module to your project, as described in
+    \l {Adding and Removing Modules}.
+
+    You can use the following components in your scenes to determine camera
+    projection:
 
     \list
         \li \l{PerspectiveCamera}{Camera Perspective} - is the standard camera
@@ -60,7 +71,7 @@
     You can position the camera in the scene and set the direction it is facing.
     The default direction of the camera is such that the forward vector is
     looking up the +z axis, and the up direction vector is up the +y axis. You
-    can apply transforms to the camera and its parent types to define
+    can apply transforms to the camera and its parent components to define
     exactly where your camera is located and in which direction it is facing.
 
     The second part of determining the projection of the camera is defining the
@@ -69,6 +80,8 @@
 
     You can edit the camera properties in the \uicontrol Properties view.
 
+   \image studio-qtquick-camera-properties "Properties view for Perspective Camera"
+
     \section1 Setting Camera Field of View
 
     The camera frustum can be obtained by taking a frustum (that is, a
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
index 225902dc3e..7ebdbbf772 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc
@@ -30,24 +30,25 @@
 
     \title Using 3D Components
 
-    To add 3D components to the scene, drag and drop a them from
-    \uicontrol Library > \uicontrol {QML Types} > \uicontrol {Qt Quick 3D} to
-    the scene or to a 3D view in \uicontrol Navigator.
+    To use 3D components, you need to first add the required modules to your
+    project in \l Library. For more information, see
+    \l{Adding and Removing Modules}. You can then add 3D components to your scene
+    by dragging-and-dropping them from \uicontrol Library > \uicontrol Components >
+    \uicontrol QtQuick3D group to \l {3D Editor} or to a 3D view in \l Navigator.
 
     \note Using 3D components will affect the performance of your UI. You should
     not use 3D components if the same results can be achieved using 2D
     components.
 
     To edit 3D components, select the component in \uicontrol {3D Editor} or in
-    \uicontrol Navigator and set its properties in the \uicontrol Properties
-    view.
+    \uicontrol Navigator and set its properties in the \l Properties view.
 
     \list
         \li \l {Setting Group Properties}
 
             You can set the opacity, visibility, and transform properties
             of all 3D components.
-        \li \l {Adding Models}
+        \li \l {Adding 3D Models}
 
             You can use the model component to load static mesh data from
             storage or one of the built-in primitive types: cube, cone,
@@ -55,7 +56,7 @@
             meshes and sub-meshes.
         \li \l {Using Materials and Shaders}
 
-            You can use materials and shaders to define how object surfaces
+            You can use materials and shaders to define how component surfaces
             are rendered in a scene and during live preview.
         \li \l {Attaching Textures to Materials}
 
@@ -65,7 +66,6 @@
         \li \l {Using 3D Materials}
 
             You can apply a set of predefined 3D materials on your models.
-
         \li \l {Applying 3D Effects}
 
             You can use 3D effect components to generate post-processing
@@ -85,12 +85,12 @@
             scene and set their properties.
         \li \l {Using Scene Camera}
 
-            To project a 3D scene to a 2D viewport, such as
-            \uicontrol {Form Editor}, it is necessary to view the scene from a
-            camera. You can select the camera type and set its properties.
+            To project a 3D scene to a 2D viewport, such as \l {Form Editor},
+            it is necessary to view the scene from a camera. You can select the
+            camera type and set its properties.
         \li \l {Setting Scene Environment}
 
-            You can use the SceneEnvironment type to specify how the scene is
-            rendered globally.
+            You can use the SceneEnvironment component to specify how the scene
+            is rendered globally.
      \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
index dd10c8528f..27821ba767 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -39,23 +39,20 @@
     materials. Each effect or material must have a fragment shader that
     implements all the functions needed to calculate the shaded color. The
     material system also offers ready-made functions to help you implement
-    the material.
+    the material. If the 3D effects and materials are not displayed in
+    \l Library, you should add the \uicontrol QtQuick3D.Effects and
+    \uicontrol QtQuick3D.Materials modules to your project, as described in
+    \l {Adding and Removing Modules}.
 
     The material system supports dielectric, metallic, and transparent
     materials, point lights, area lights, ambient occlusion, shadowing,
     two-sided polygons, index-of-refraction, and fragment cutoff (masking).
     For more information, see \l {Qt Quick 3D Custom Material Reference}.
 
-    You can use the QML types in the \uicontrol {Qt Quick 3D Custom Shader Utils}
-    tab of \uicontrol Library to create custom effects and materials. To make
-    the \uicontrol Effect and \uicontrol {Custom Material} types appear in the
-    tab, you must select \uicontrol {Add Import} in the \uicontrol {QML Imports}
-    tab, and then select \uicontrol QtQuick3D.Effects and
-    \uicontrol QtQuick3D.Materials to import the QML types in those modules to
-    your project.
-
-    For more information about the shader utilities and commands and their
-    properties, see \l {Using Custom Shaders}.
+    You can use the components in \uicontrol Library > \uicontrol Components >
+    \uicontrol QtQuick3D > \uicontrol {Qt Quick 3D Custom Shader Utils} to
+    create custom effects and materials. For more information about the shader
+    utilities and commands and their properties, see \l {Using Custom Shaders}.
 
     \image studio-qtquick-3d-shader-utilities.png "Qt Quick 3D Custom Shader Utils tab in Library"
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
index 2232020c60..f8ad18d2e0 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-shaders.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -32,8 +32,15 @@
 
     \title Using Custom Shaders
 
-    You can use the Qt Quick 3D shader utilities and commands to create your own
-    effects and materials.
+    You can use the 3D shader utilities and commands available in \l Library
+    > \uicontrol Components > \uicontrol QtQuick3D > \uicontrol
+    {Custom Shader Utils} to create your own effects and materials.
+
+    \image studio-qtquick-3d-shader-utilities.png
+
+    If the custom shader utilities are not displayed in \uicontrol Library, you
+    should add the \uicontrol QtQuick3D module to your project, as described in
+    \l {Adding and Removing Modules}.
 
     For more information on using the shaders, see
     \l {Creating Custom Effects and Materials}.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
deleted file mode 100644
index 1756cfb7ec..0000000000
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Design Studio documentation.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-**
-****************************************************************************/
-
-/*!
-    \page studio-3d-design-mode.html
-    \if defined (qtdesignstudio)
-    \previouspage studio-3d.html
-    \else
-    \previouspage studio-importing-3d.html
-    \endif
-    \nextpage studio-3d-editor.html
-
-    \title Editing 3D Assets in Design Mode
-
-    \QDS opens QML files that contain 3D scenes in the Design mode and the
-    scenes in \uicontrol {3D Editor}. You can add imported 3D assets to projects
-    and edit them to create scenes and states, as well as the transitions
-    between them. The other views enable you to select QML types to use in the
-    scene, specify properties for them, and view them in a tree structure,
-    as well as to create connections and browse projects and files.
-
-    \image studio-editing-3d-scenes.png "Views for editing 3D assets in Design mode"
-
-    To open the following views, select \uicontrol View > \uicontrol Views:
-
-    \list
-        \li \uicontrol {3D Editor} (1) is the working area where you create the
-            scene, position the model, light and camera, as well as move, rotate
-            and scale items. For more information on how to edit 3D scenes, see
-            \l {3D Editor}.
-        \li \uicontrol {Form Editor} (2) is where you see the scene projected by
-            the camera.
-        \li \uicontrol {Library} (3) displays the building blocks that you
-             can use to create scenes: predefined Qt Quick 3D Components,
-             Qt Quick Controls, your own 3D assets that you import to the
-             project, and other assets. For more information, see \l {Adding 3D
-            Views}.
-        \li \uicontrol {Navigator} (4) displays the items in the current QML
-            file as a tree structure. For more information, see
-            \l {Navigator}.
-        \li \uicontrol {Properties} (5) organizes the properties of the
-            selected item. You can change the properties also in \uicontrol
-            {Text Editor}. For more information, see
-            \l {Specifying Component Properties}.
-        \li \uicontrol Connections (6) enables you to create connections
-            between objects, signals, and object properties. For more
-            information, see \l{Adding Connections}.
-        \li \uicontrol States displays the different states of the item. QML
-            states typically describe user interface configurations, such as the
-            UI controls, their properties and behavior and the available
-            actions. For more information, see \l {Adding States}.
-        \li \uicontrol Timeline provides a timeline and keyframe based
-            editor that enables you to animate the properties of components.
-            For more information, see \l {Creating Animations}.
-    \endlist
-
-    For more information, watch the following video:
-
-    \youtube w1yhDl93YI0
-
-    For more information on other views, see
-    \l {Design Views}.
-*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index 4e11a558cc..1c4210d8c0 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -41,11 +41,11 @@
 
     When you import 3D scenes from files that you exported from 3D graphics
     tools, you also import a \l{Using Scene Camera}{scene camera},
-    \l{Using Lights}{light}, \l{Adding Models}{model}, and
+    \l{Using Lights}{light}, \l{Adding 3D Models}{model}, and
     \l {Using Materials and Shaders}{materials}. If your scene did not contain
     them, you can add the corresponding \l {Using 3D Components}{Qt Quick 3D}
-    components from \l Library > \uicontrol Components > \uicontrol QtQuick3D >
-    \uicontrol {Qt Quick 3D}.
+    components from \l Library > \uicontrol Components > \inlineimage plus.png
+    > \uicontrol QtQuick3D > \uicontrol {Qt Quick 3D}.
 
     You can use the \l{Summary of the 3D Editor Toolbar Buttons}{toolbar buttons}
     to \e transform 3D components and manipulate the 3D scene. Transformation
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
index 168113d8a7..0f2b5ba5a3 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-effects.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -32,16 +32,15 @@
 
     \title Applying 3D Effects
 
-    \QDS provides a set of Qt Quick 3D effects that inherit the types in the
-    \l {Qt Quick 3D Effects QML Types}{Qt Quick 3D Effects} module.
-
-    To apply a visual effect to a scene, drag-and-drop an effect from
-    the \uicontrol {Qt Quick 3D Effects} tab in \uicontrol Library to a
-    \uicontrol {View 3D} object in \uicontrol Navigator. You can apply multiple
+    \QDS provides a set of 3D effects, which are visible in \l {Form Editor}.
+    To apply a visual effect to a scene, drag-and-drop an effect from \l Library
+    > \uicontrol Components > \uicontrol QtQuick3D > \uicontrol {Qt Quick 3D Effects}
+    to a \uicontrol View3D component in \l Navigator. You can apply multiple
     effects to a scene. Select the \uicontrol {Scene Environment} component in
-    \uicontrol Navigator to view the applied effects in \uicontrol Properties >
-    \uicontrol {Scene Environment} > \uicontrol Effect. The effects are visible
-    in the \uicontrol {Form Editor} view.
+    \uicontrol Navigator to view the applied effects in \l Properties >
+    \uicontrol {Scene Environment} > \uicontrol Effect. If the effects are not
+    displayed in \l Library, you should add the \uicontrol QtQuick3D.Effects
+    module to your project, as described in \l {Adding and Removing Modules}.
 
     See the following table for available effects and example images.
 
@@ -136,9 +135,9 @@
         camera where the content is in perfect focus.
 
         The \uicontrol {Focus Range} property specifies the distance around the
-        \uicontrol {Focus Distance} where items are fully in focus. The focus
-        then fades away to fully blurred by the same distance on both the near
-        and far sides.
+        \uicontrol {Focus Distance} where components are fully in focus. The
+        focus then fades away to fully blurred by the same distance on both the
+        near and far sides.
 
     \row
         \li Desaturate
@@ -232,9 +231,9 @@
     \row
         \li Gaussian Blur
         \li \image effect-gaussian-blur.png "The Gaussian Blur effect"
-        \li A two-pass gaussian blur effect that blurs all objects in the scene
-        evenly. To keep the effect performant, large blur amount produces a
-        mosaic result instead of smooth blurriness.
+        \li A two-pass gaussian blur effect that blurs all components in the
+        scene evenly. To keep the effect performant, large blur amount produces
+        a mosaic result instead of smooth blurriness.
 
         The \uicontrol Amount property defines the strength of the blur.
 
@@ -272,7 +271,7 @@
         \li Motion Blur
         \li \image effect-motion-blur.png "The Motion Blur effect"
         \li A motion blur effect that creates an apparent streaking for rapidly
-        moving objects in the scene.
+        moving components in the scene.
 
         \note Only has a visible effect if the background of the scene is set to
         be transparent in the \uicontrol {Background Mode} field of the
@@ -351,21 +350,21 @@
         focus bar in normalized coordinates.
 
         The \uicontrol {Focus Width} property defines a normalized range for
-        Focus Position. Objects within this range will be in focus.
+        Focus Position. Components within this range will be in focus.
 
         The \uicontrol {Blur Amount} property defines the amount of blur.
         Amounts above 4 may cause artifacts.
 
         The \uicontrol Vertical property changes the direction of the effect
         from horizontal to vertical, while the \uicontrol Inverted property
-        inverts the blur area, causing the center of the object to become
+        inverts the blur area, causing the center of the component to become
         blurred.
 
     \row
         \li Vignette
         \li \image effect-vignette.png "The Vignette effect"
         \li A vignette effect that reduces brightness towards the periphery of
-        an object.
+        a component.
 
         The \uicontrol Strength property defines the strength of vignetting,
         while \uicontrol Radius specifies its size.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
index 90998abc22..1584e1048c 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc
@@ -30,7 +30,7 @@
     \nextpage quick-converting-ui-projects.html
     \else
     \previouspage exporting-from-maya.html
-    \nextpage studio-3d-design-mode.html
+    \nextpage studio-3d-editor.html
     \endif
 
     \title Importing 3D Assets
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index 555bf9d91b..d2fee05bcd 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -34,10 +34,12 @@
 
     Light components are the primary source of lighting in a \QDS scene.
     As a secondary light source, you can use \l{Using Image-based Lighting}
-    {image-based lighting}.
+    {image-based lighting}. If the light components are not displayed in
+    \l Library, you should add the \uicontrol QtQuick3D module to your project,
+    as described in \l {Adding and Removing Modules}.
 
     By default, all imported scenes are created with one directional light.
-    You can use the following \l{Qt Quick 3D} components to add lights:
+    You can use the following components to add lights:
 
     \list
         \li \l{DirectionalLight}{Light Directional}
@@ -116,8 +118,8 @@
     Turn up the quadratic fade to increase the rate at which the lighting effect
     dims on surfaces that are far away from the light. The value 1.0 means that
     the point light fade exactly follows the inverse square law. For example,
-    when the distance to an object doubles, the light intensity decreases to one
-    fourth.
+    when the distance to a component doubles, the light intensity decreases to
+    one fourth.
 
     Aside from fade, a point light has the same properties as a directional
     light.
@@ -142,14 +144,14 @@
 
     An area light is similar to the directional light. However, instead of
     emitting an equally bright light across the whole scene, the area light
-    emits directional light from a rectangle shaped object. You can set the
+    emits directional light from a rectangle shaped component. You can set the
     \uicontrol Width and \uicontrol Height properties to determine the size
     of the area light.
 
     Aside from the size, an area light has the same properties as a directional
     light.
 
-    The image below shows an example on how to light an object with different
+    The image below shows an example on how to light a component with different
     colors using two different area lights.
 
     \image studio-3d-area-light.png
@@ -168,7 +170,7 @@
     \uicontrol {Shadow filter} property.
 
     Tweak the \uicontrol {Shadow bias} property value by small amounts
-    if you see objects casting shadows on themselves.
+    if you see components casting shadows on themselves.
 
     To specify the quality of the shadow map created for shadow rendering, set
     the \uicontrol {Shadow map quality} property. Lower quality uses less
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 f198f2d93f..dc3cf6247b 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -220,11 +220,11 @@
 
     \section1 Applying Materials to Models
 
-    To apply materials to models:
+    To apply materials to \l {Adding 3D Models}{models}:
 
     \list 1
-        \li Drag and drop a material component from the \uicontrol Library to a
-            Model component in the \uicontrol Navigator.
+        \li Drag and drop a material component from \l Library to a model
+            component in \l Navigator.
         \li Select the Model component.
         \li In the \uicontrol Properties view, select the material for the model
             in the \uicontrol Materials list.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
index 7101135bfc..c0dcf127a3 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -33,12 +33,15 @@
     \title Using 3D Materials
 
     \QDS provides a set of pregenerated Qt Quick 3D materials that can be used
-    to create good-looking models quickly and easily.
-
-    To apply a 3D material to a component, drag-and-drop a material from the
-    \uicontrol {Qt Quick 3D Materials} tab of \uicontrol Library to a model
-    component in \uicontrol Navigator. The materials you add to the model are
-    listed in the model component's \uicontrol Properties view.
+    to create good-looking \l {Adding 3D Models}{models} quickly and easily.
+
+    To apply a 3D material to a component, drag-and-drop a material from
+    \l Library > \uicontrol Components > \uicontrol QtQuick3D >
+    \uicontrol {Qt Quick 3D Materials} to a model component in \l Navigator.
+    The materials you add to the model are listed in the model component's
+    \l Properties view. If the 3D materials are not displayed in \l Library,
+    you should add the \uicontrol QtQuick3D.Materials module to your project, as
+    described in \l {Adding and Removing Modules}.
 
     Each material has its own set of properties that can be used to further
     define the appearance of the material. For each material the \uicontrol
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index cfc573470f..b9fb52f76f 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -30,16 +30,24 @@
     \previouspage studio-3d-node.html
     \nextpage studio-3d-materials.html
 
-    \title Adding Models
+    \title Adding 3D Models
+
+    \QDS \l Library features some built-in primitive 3D models. This allows you
+    to add cubes, cones, cylinders, and planes (rectangles) to your scene.
+
+    \image studio-3d-models.png
 
     A Model component loads mesh data from a file. You can modify how the
-    component is shaded by adding materials to the model.
+    component is shaded by adding \l{Using 3D Materials}{materials} to the model.
 
-    A model can load static meshes from storage or one of the built-in primitive
-    types: cube, cone, cylinder, plane (rectangle) or sphere. You can drag and
-    drop a model from the \uicontrol Library to a 3D scene.
+    You can drag-and-drop a model from \uicontrol Library > \uicontrol Components
+    > \uicontrol QtQuick3D > \uicontrol {Qt Quick 3D} to \l {3D Editor} or to
+    \l Navigator > \uicontrol {Scene Environment} > \uicontrol Scene. If the
+    models are not displayed in \uicontrol Library, you should add the
+    \uicontrol QtQuick3D module to your project, as described in
+    \l {Adding and Removing Modules}.
 
-    \image studio-qtquick-3d-components.png "Library view QML Types tab Qt Quick 3D section"
+    \image studio-qtquick-3d-components.png "The Qt Quick 3D section in Library"
 
     You can change the model type in the \uicontrol Source field in the
     \uicontrol Properties view. Select the \inlineimage plus.png
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
index 29b171c348..f9e3a9b818 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
@@ -30,13 +30,19 @@
 
     \title Setting Group Properties
 
-    The \uicontrol Group component is a \uicontrol Node type that can be used to
-    wrap other objects for the purpose of grouping them. This allows you to
-    transform and set the opacity and visibility of multiple 3D components in
-    the \uicontrol Properties view simultaneously. To add a \uicontrol Group
-    component to your scene, drag-and-drop it from \uicontrol Library >
-    \uicontrol {QML Types} > \uicontrol {Qt Quick 3D} to the \uicontrol
-    {3D Editor} view or to a \uicontrol Scene component in \uicontrol Navigator.
+    The \uicontrol Group component is a \uicontrol Node component that can be
+    used to wrap other objects for the purpose of grouping them. This allows you
+    to transform and set the opacity and visibility of multiple 3D components in
+    the \l Properties view simultaneously. To add a \uicontrol Group component
+    to your scene, drag-and-drop it from \l Library > \uicontrol Components >
+    \uicontrol {QtQuick3D} > \uicontrol {Qt Quick 3D} to the \l {3D Editor} view
+    or to a \uicontrol Scene component in \l Navigator. If the \uicontrol Group
+    component is not displayed in\uicontrol Library, you should add the
+    \uicontrol QtQuick3D module to your project, as described in
+    \l {Adding and Removing Modules}.
+
+    Select the \uicontrol Group component in \uicontrol Navigator to modify its
+    properties in the \l Properties view.
 
     \section1 Setting Node Opacity and Visibility
 
@@ -84,6 +90,6 @@
     around a point other than its local origin. Pivot values are applied before
     scaling and rotation values.
 
-    A line is drawn in the 3D editor from the pivot point to the center of the
-    component to provide a visual connection between them.
+    A line is drawn in \uicontrol {3D Editor} from the pivot point to the center
+    of the component to provide a visual connection between them.
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
index 7a93ea02d0..b518ed20cc 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Design Studio.
@@ -32,8 +32,9 @@
 
     \title Attaching Textures to Materials
 
-    You can use the Texture 3D QML type to attach textures to materials.
-    You specify an image and how it is mapped to meshes in a 3D scene.
+    You can use the \uicontrol Texture component to attach textures to materials.
+    You specify an image to use as the source file for the \uicontrol Texture,
+    and also define how it is mapped to meshes in a 3D scene.
 
     \image studio-qtquick-3d-texture.png "Texture attached to a material in Design mode"
 
@@ -45,7 +46,7 @@
 
     UV mapping is the process of projecting 2D images to the surface of a
     3D model for texture mapping. The letters \e U and \e V denote the axes
-    of the 2D texture, because x, y, and z are already used to denote the
+    of the 2D texture because x, y, and z are already used to denote the
     axes of the 3D object in the model space. You can paint the polygons that
     make up a 3D object with color and other surface attributes from a UV
     texture map. Pixels in the image are assigned to surface mappings on the
@@ -112,24 +113,29 @@
 
     \section1 Applying Textures to Materials
 
-    Drag and drop an image from \uicontrol Library > \uicontrol Assets
-    on a material to create a texture component. Dragging an image
-    to a default or principled material opens a
-    \uicontrol {Select Texture Property} dialog. You can select the
-    property to attach the texture to in the \uicontrol {Set texture to property}
-    field. For a custom material, you must assign the texture to a map.
-
-    To use Texture components to apply textures to materials:
-
-    \list 1
-        \li Drag and drop a Texture component from the \uicontrol Library to a
-            material component in the \uicontrol Navigator.
-        \li In the \uicontrol Properties view, specify the image to use in the
-            \uicontrol Source field.
-            \image studio-qtquick-3d-texture-properties.png "Texture properties"
-        \li Select the material component and specify the id of the texture to
-            use in the \uicontrol Properties view, \uicontrol {Diffuse map}
-            field.
-            \image studio-qtquick-3d-material-texture.png "Material properties"
+    Drag-and-drop an image from \l Library > \uicontrol Assets on a material to
+    create a texture component. Dragging an image to a default or principled
+    material opens a \uicontrol {Select Texture Property} dialog. You can select
+    the  property to attach the texture to in the \uicontrol {Set texture to property}
+    field. For a custom material, you must assign the texture to a map. If the
+    \uicontrol Texture component is not displayed in \uicontrol Library, you
+    should add the \uicontrol QtQuick3D module to your project, as described in
+    \l {Adding and Removing Modules}.
+
+    To use Texture components to apply textures to materials, drag-and-drop a
+    Texture component from \l Library to a material component in \l Navigator.
+    The new texture should now be visible in \l {Form Editor} and \l {3D Editor}.
+    \note If the colors in your texture are not visualized correctly, you should
+    check the color in the \uicontrol Diffuse property of the material and try
+    changing it to white (#ffffff).
+
+    \image studio-qtquick-3d-material-texture.png "Material properties"
+
+    To change the source file for the texture, select the \uicontrol Texture
+    component in \uicontrol Navigator, go to the \uicontrol Properties view, and
+    specify a new image to use in the \uicontrol Source field.
+
+    \image studio-qtquick-3d-texture-properties.png "Texture properties"
+
     \endlist
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
index 7886acbfcd..6369ec4ea9 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Design Studio documentation.
@@ -31,24 +31,23 @@
     \title Adding 3D Views
 
     To create a Qt Quick 3D UI project, we recommend using a \uicontrol
-    {Qt Quick 3D Application Template} wizard template that imports the
-    \l{Qt Quick 3D} QML types to the \uicontrol {QML Types} tab in
-    \uicontrol Library and contains a 3D view. A 3D view type includes a
-    \l {Setting Scene Environment}{scene environment} as well as a scene
-    \l {Using Lights}{light}, \l {Using Scene Camera}{camera}, and \l {Adding
-    Models}{model}. A default \l {Using Materials and Shaders}{material} is
-    attached to the model. You can attach \l {Attaching Textures to Materials}
-    {textures} to materials. For more information about creating projects, see
-    \l{Creating Projects}.
-
-    To add a 3D view to some other kind of project and to display the Qt Quick
-    3D QML types in \uicontrol Library, select \uicontrol Library >
-    \uicontrol {QML Imports} > \uicontrol {Add Import} > \uicontrol QtQuick3D.
+    {Qt Quick 3D Application Template} wizard template that adds the
+    \l {Using 3D Components}{Qt Quick 3D} components to \l Library and contains
+    a 3D view. A 3D view component includes a \l {Setting Scene Environment}
+    {scene environment} as well as a scene \l {Using Lights}{light},
+    \l {Using Scene Camera}{camera}, and \l {Adding 3D Models}{model}. A default
+    \l {Using Materials and Shaders}{material} is attached to the model. You can
+    attach \l {Attaching Textures to Materials}{textures} to materials. For more
+    information about creating projects, see \l{Creating Projects}.
+
+    To add a 3D view to some other kind of a project, you should first add the
+    \uicontrol QtQuick3D module to \uicontrol Library, as described in
+    \l {Adding and Removing Modules}.
 
     \image studio-qtquick-3d-components.png "Qt Quick 3D components in Library"
 
-    After importing the Qt Quick 3D QML types, drag and drop a \uicontrol
-    View3D type to \uicontrol Navigator or to \uicontrol {Form Editor}.
+    You can now drag-and-drop a \uicontrol View3D component to \l Navigator or
+    to \l {Form Editor}.
 
     \image studio-navigator-view3d.png "A View 3D component in the Navigator"
 
@@ -64,7 +63,7 @@
     Similarly to other components, you can select a 3D view in \uicontrol
     Navigator or \uicontrol {3D Editor} and modify its property values in the
     \uicontrol Properties view. Use the properties in the \uicontrol View3D
-    tab to set some properties specific to a 3D view component.
+    tab to set properties specific to a 3D view component.
 
     \image studio-qtquick-3d-view.png "View 3D component properties"
 
@@ -78,7 +77,7 @@
 
     The \uicontrol {Import Scene} property defines the ID of the component to
     render to \uicontrol {Form Editor}. The component does not have to be a
-    child of a 3D view type. This referenced component becomes a sibling to
+    child of a 3D view component. This referenced component becomes a sibling to
     child items of a 3D view, if there are any. You can use this property, for
     example, to create a split screen view showing your scene from multiple
     cameras. For more information on how to to use a 3D view to show a scene
@@ -86,5 +85,4 @@
 
     \note The \uicontrol {Import Scene} property can only be set once.
     Subsequent changes will have no effect.
-
 */
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
index ce8f4d0d60..3163eabbda 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
@@ -27,7 +27,7 @@
     \page studio-3d.html
     \previouspage quick-states.html
     \if defined(qtdesignstudio)
-    \nextpage studio-3d-design-mode.html
+    \nextpage studio-3d-view.html
     \else
     \nextpage exporting-3d-assets.html
     \endif
@@ -44,9 +44,9 @@
     When you import 3D scenes from files that you exported from 3D graphics
     tools, you also import the camera, light, model, and materials as 3D
     components. If your scene did not contain them, you can add predefined
-    Qt Quick 3D components to it and edit their properties to fit your needs.
+    3D components to it and edit their properties to fit your needs.
 
-    The following topics contain information about working with Qt Quick 3D:
+    The following topics contain information about editing 3D scenes:
 
     \list
         \if defined (qtcreator)
@@ -62,12 +62,6 @@
             applications and stored in one of the supported file formats.
             You can then edit them in the Design mode.
         \endif
-
-        \li \l {Editing 3D Assets in Design Mode}
-
-            \QDS opens QML files that contain 3D scenes in the Design mode and
-            the scenes in \uicontrol {3D Editor}. You can add imported 3D assets
-            to projects as 3D components.
         \li \l{Adding 3D Views}
 
             You can drag and drop 3D components from \uicontrol Library
@@ -78,4 +72,9 @@
             You can speficy properties for 3D components, such as cameras,
             lights, materials, and shaders, in the \uicontrol Properties view.
      \endlist
+
+    For more information, watch the following video:
+
+    \youtube w1yhDl93YI0
+
 */