Fix some incorrect statements and methods in the VideoOutput docs

Remove left-over doc from Qt 5.15 that is not valid anymore, and
adjust the name of a QML property.

Change-Id: I4c2448276ad6e593c0b352f2cf7bd57a139ab2e1
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 127aae7c7ff3f51ff1755f7301063f583558871b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 6 insertions, 18 deletions

diff --git a/src/multimediaquick/qquickvideooutput.cpp b/src/multimediaquick/qquickvideooutput.cpp
index f25ab0c84..6cef7027a 100644
--- a/src/multimediaquick/qquickvideooutput.cpp
+++ b/src/multimediaquick/qquickvideooutput.cpp
@@ -93,11 +93,11 @@ inline int qNormalizedOrientation(int o)
         MediaPlayer {
             id: player
             source: "file://video.webm"
+            videoOutput: videoOutput
         }
 
         VideoOutput {
             id: videoOutput
-            source: player
             anchors.fill: parent
         }
     }
@@ -108,17 +108,6 @@ inline int qNormalizedOrientation(int o)
     For a description of stretched uniformly scaled presentation, see the \l fillMode property
     description.
 
-    The VideoOutput item works with backends that support either QObject or
-    QPlatformVideoSink. If the backend only supports QPlatformVideoSink, the video is rendered
-    onto an overlay window that is layered on top of the QtQuick window. Due to the nature of the
-    video overlays, certain features are not available for these kind of backends:
-    \list
-    \li Some transformations like rotations
-    \li Having other QtQuick items on top of the VideoOutput item
-    \endlist
-    Most backends however do support QObject and therefore don't have the limitations
-    listed above.
-
     \sa MediaPlayer, Camera
 
 \omit
@@ -130,7 +119,7 @@ inline int qNormalizedOrientation(int o)
     may be used to disable the screensaver in this fashion:
 
     \qml
-    import QtSystemInfo 5.0
+    import QtSystemInfo
 
     ScreenSaver { screenSaverEnabled: false }
     \endqml
@@ -163,13 +152,12 @@ QQuickVideoOutput::~QQuickVideoOutput()
 }
 
 /*!
-    \qmlproperty object QtMultimedia::VideoOutput::videoSurface
-    \since 5.15
+    \qmlproperty object QtMultimedia::VideoOutput::videoSink
 
-    This property holds the underlaying video surface that can be used
+    This property holds the underlaying C++ QVideoSink object that is used
     to render the video frames to this VideoOutput element.
-    It is similar to setting a QObject with \c videoSurface property as a source,
-    where this video surface will be set.
+
+    Normal usage of VideoOutput from QML should not require using this property.
 */
 
 QVideoSink *QQuickVideoOutput::videoSink() const