diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
| commit | f9014d136f504c6377d1329c822f11a8b58ccdbe (patch) | |
| tree | 1c1a752d8ba6b5094b182305d65ca0d0101e1ed0 /src/multimedia/playback/qmediaplayer.cpp | |
| parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) | |
| parent | 06259f1dfbd9cb2ebd58bba59381a42dc8a758df (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index e094e006e..aae4c7efa 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -335,7 +335,7 @@ void QMediaPlayerPrivate::setPlaylistMedia() return; } else if (control != 0) { // If we've just switched to a new playlist, - // then last emited currentMediaChanged was a playlist. + // then last emitted currentMediaChanged was a playlist. // Make sure we emit currentMediaChanged if new playlist has // the same media as the previous one: // sample.m3u |