summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-20 03:01:23 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-20 03:01:30 +0200
commitd4a3e85eb86d551bdbeae973ab59c1fcee09393e (patch)
treef68385bcae10575566bb1039cdeada618e39b4ac /src/imports
parent7b1bb300166aa19dc0f4c6838eb6d284af73236c (diff)
parentc796fffc8d727c2eb469cdb183b7b1d4ddab0a68 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 692aec2d0..9d41c77fa 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -1303,6 +1303,16 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
This property holds the source URL of the media.
Setting the \l source property clears the current \l playlist, if any.
+
+ Since Qt 5.12.2, the url scheme \c gst-pipeline provides custom pipelines
+ for the GStreamer backend.
+
+ If the pipeline contains a \c qtvideosink element,
+ the current VideoOutput will be used for rendering video.
+
+ \snippet multimedia-snippets/qtvideosink.qml complete
+
+ \sa QMediaPlayer::setMedia()
*/
/*!