diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
| commit | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (patch) | |
| tree | 40fd93907c281b8947bc8db916419e0e9b928c6e /src/multimedia/playback/qmediaplayer.cpp | |
| parent | 54521ea05d2208a31b6111d5b9248ca7bf2f97ec (diff) | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 648c13220..191095e82 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -962,8 +962,8 @@ void QMediaPlayer::setPlaybackRate(qreal rate) Sets the current \a media source. If a \a stream is supplied; media data will be read from it instead of resolving the media - source. In this case the media source may still be used to resolve additional information - about the media such as mime type. + source. In this case the media source may still be used to resolve additional information + about the media such as mime type. The \a stream must be open and readable. Setting the media to a null QMediaContent will cause the player to discard all information relating to the current media source and to cease all I/O operations related |