summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-28 07:37:55 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-28 07:37:55 +0200
commit2de952fbd9843046e0612f1eaf257c9de94c966e (patch)
tree8ed82d62688ff9cb75ad446a78b1fdc2135429f3 /src/imports
parent8972b26890b9c4d7e82cc47a4864fda0a8a78ff4 (diff)
parentd4a3e85eb86d551bdbeae973ab59c1fcee09393e (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
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()
*/
/*!