Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
2015-02-13 13:10:48 +01:00
parent bbfccc7135 06259f1dfb
commit f9014d136f
27 changed files with 128468 additions and 29717 deletions
--- 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