Merge remote-tracking branch 'origin/8.0' into 9.0

 Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9

5 files changed, 42 insertions, 12 deletions

diff --git a/doc/qtdesignstudio/images/3d-view-context-menu.png b/doc/qtdesignstudio/images/3d-view-context-menu.png
new file mode 100644
index 0000000000..c2e35e0019
--- /dev/null
+++ b/doc/qtdesignstudio/images/3d-view-context-menu.png
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
index 303a713a63..202249188d 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
@@ -16,10 +16,18 @@
 
      \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components"
 
-    Add a camera by dragging-and-dropping one of the camera components from
-    \uicontrol Components > \uicontrol {Qt Quick 3D} > \uicontrol
-    {Qt Quick 3D} to the \l {3D} view or to a 3D view in \l Navigator.
-    If the cameras are not displayed in \uicontrol {Components}, add the
+    To add a camera component to your UI, do one of the following:
+    \list
+      \li Drag a camera component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Cameras from the context menu.
+      \note You can only create \uicontrol {Camera Perspective} and
+      \uicontrol {Camera Ortographic} this way.
+    \endlist
+
+    If you cannot find the camera components in \uicontrol {Components}, add the
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index e7487a7709..810692e89b 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -48,6 +48,16 @@
     Additionally, you can toggle the visibility of the grid, selection boxes,
     icon gizmos, and camera frustums in the 3D scene.
 
+    There is a context menu in the \uicontrol 3D view. To open it, right-click
+    in the \uicontrol 3D view. From the context menu you can:
+    \list
+      \li Create cameras, lights, and models.
+      \li Open \uicontrol {Material Editor} and edit materials.
+      \li Delete components
+    \endlist
+
+    \image 3d-view-context-menu.png
+
     To refresh the contents of the \uicontrol{3D} view, press \key P or
     select the \inlineimage icons/reset.png
     (\uicontrol {Reset View}) button.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index 4ce143c8ce..4bd44874ab 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -12,9 +12,14 @@
     As a secondary light source, you can use \l{Setting the Light Probe}
     {image-based lighting}.
 
-    To add light components to your UI, drag-and-drop them from
-    \uicontrol Components > \uicontrol {Qt Quick 3D} to the \l {3D} view or to
-    \l Navigator > \uicontrol {Scene Environment} > \uicontrol Scene.
+    To add a light component to your UI, do one of the following:
+    \list
+      \li Drag a light component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Lights from the context menu.
+    \endlist
 
     If you cannot find the light components in \uicontrol {Components}, add the
     \uicontrol {Qt Quick 3D} module to your project as instructed in
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index 629a628490..9070ef0835 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -13,14 +13,21 @@
 
     \image studio-3d-models.png "Various 3D models in the 3D view"
 
-    A Model component loads mesh data from a file. You can modify how the
+    A model component loads mesh data from a file. You can modify how the
     component is shaded by using materials. For more information, see
     \l {Materials and Shaders} and \l {Creating Custom Materials}.
 
-    You can drag-and-drop a model from \uicontrol Components
-    > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D} to the \l {3D} view or
-    to \l Navigator > \uicontrol {Scene Environment} > \uicontrol Scene. If the
-    models are not displayed in \uicontrol {Components}, you should add the
+    To add a model component to your UI, do one of the following:
+    \list
+      \li Drag a model component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Primitives from the context menu.
+      \note You can not create \uicontrol Empty models this way.
+    \endlist
+
+    If you cannot find the model components in \uicontrol {Components}, add the
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.