diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:13:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:13:47 +0100 |
| commit | 6166f102f5e52007f8e4e018adb73d26513557b3 (patch) | |
| tree | ab6dcd29f68e07cf8c6643d69af679ed9b194019 /src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | |
| parent | 0a7b553eeab0b81502189f6244ffc65c33cdaaa0 (diff) | |
| parent | 604a5753fa2d9b8e1ef65ccd8c5fb72465462479 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/plugins/android/src/wrappers/jni/androidcamera.cpp
Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp')
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp index 3ba640cd6..1cccbfa01 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp @@ -508,6 +508,9 @@ void MmRendererMediaPlayerControl::play() return; } + if (m_mediaStatus == QMediaPlayer::EndOfMedia) + m_position = 0; + setPositionInternal(m_position); setVolumeInternal(m_muted ? 0 : m_volume); setPlaybackRateInternal(m_rate); |