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

Change-Id: Ida354e9c302ef968fbae78edd60a1ad1fabef477

1 files changed, 18 insertions, 0 deletions

diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp
index 1268ab03d..71d99d84b 100644
--- a/src/extras/defaults/qforwardrenderer.cpp
+++ b/src/extras/defaults/qforwardrenderer.cpp
@@ -367,6 +367,24 @@ float QForwardRenderer::gamma() const
     return d->m_viewport->gamma();
 }
 
+/*!
+    \qmlproperty bool ForwardRenderer::showDebugOverlay
+
+    If true, a debug overlay will be rendered over the scene. It will show
+    detailed information about the runtime rendering state, let the user
+    turn logging on and off, etc.
+
+    \since 5.15
+*/
+/*!
+    \property QForwardRenderer::showDebugOverlay
+
+    If true, a debug overlay will be rendered over the scene. It will show
+    detailed information about the runtime rendering state, let the user
+    turn logging on and off, etc.
+
+    \since 5.15
+*/
 bool QForwardRenderer::showDebugOverlay() const
 {
     Q_D(const QForwardRenderer);