Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I6e69a235f50472b8f7ac19e133a3c071ea8c4d7a

1 files changed, 23 insertions, 22 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 0ee93ab6ff..6286a1694a 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -4220,16 +4220,18 @@ QQmlIncubationController *QQuickWindow::incubationController() const
     The OpenGL context used for rendering the scene graph will be bound
     at this point.
 
-    When using the RHI and a graphics API other than OpenGL, the signal is
-    emitted after the preparations for the frame have been done, meaning there
-    is a command buffer in recording mode, where applicable. If desired, the
-    slot function connected to this signal can query native resources like the
-    command before via QSGRendererInterface. Note however that the recording of
-    the main render pass is not yet started at this point and it is not
-    possible to add commands within that pass. Instead, use
-    beforeRenderPassRecording() for that. However, connecting to this signal is
-    still important if the recording of copy type of commands is desired since
-    those cannot be enqueued within a render pass.
+    When using the RHI, the signal is emitted after the preparations for the
+    frame have been done, meaning there is a command buffer in recording mode,
+    where applicable. If desired, the slot function connected to this signal
+    can query native resources like the command before via
+    QSGRendererInterface. Note however that the recording of the main render
+    pass is not yet started at this point and it is not possible to add
+    commands within that pass. Starting a pass means clearing the color, depth,
+    and stencil buffers so it is not possible to achieve an underlay type of
+    rendering by just connecting to this signal. Rather, connect to
+    beforeRenderPassRecording(). However, connecting to this signal is still
+    important if the recording of copy type of commands is desired since those
+    cannot be enqueued within a render pass.
 
     \warning This signal is emitted from the scene graph rendering thread. If your
     slot function needs to finish before execution continues, you must make sure that
@@ -4252,18 +4254,17 @@ QQmlIncubationController *QQuickWindow::incubationController() const
 
     The OpenGL context used for rendering the scene graph will be bound at this point.
 
-    When using the RHI and a graphics API other than OpenGL, the signal is
-    emitted after scene graph has added its commands to the command buffer,
-    which is not yet submitted to the graphics queue. If desired, the slot
-    function connected to this signal can query native resources, like the
-    command buffer, before via QSGRendererInterface. Note however that the
-    render pass (or passes) are already recorded at this point and it is not
-    possible to add more commands within the scenegraph's pass. Instead, use
-    afterRenderPassRecording() for that. This signal has therefore limited use
-    and is rarely needed in an RHI-based setup. Rather, it is the combination
-    of beforeRendering() + beforeRenderPassRecording() or beforeRendering() +
-    afterRenderPassRecording() that is typically used to achieve under- or
-    overlaying of the custom rendering.
+    When using the RHI, the signal is emitted after scene graph has added its
+    commands to the command buffer, which is not yet submitted to the graphics
+    queue. If desired, the slot function connected to this signal can query
+    native resources, like the command buffer, before via QSGRendererInterface.
+    Note however that the render pass (or passes) are already recorded at this
+    point and it is not possible to add more commands within the scenegraph's
+    pass. Instead, use afterRenderPassRecording() for that. This signal has
+    therefore limited use and is rarely needed in an RHI-based setup. Rather,
+    it is the combination of beforeRendering() + beforeRenderPassRecording() or
+    beforeRendering() + afterRenderPassRecording() that is typically used to
+    achieve under- or overlaying of the custom rendering.
 
     \warning This signal is emitted from the scene graph rendering thread. If your
     slot function needs to finish before execution continues, you must make sure that