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

Change-Id: I8027e798d85ae60dbcb4fbc8592e3992af7546d4

1 files changed, 7 insertions, 3 deletions

diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index 5e2efbb99..67ce123d8 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -208,10 +208,14 @@ bool QMediaNetworkPlaylistProvider::moveMedia(int from, int to)
 {
     Q_D(QMediaNetworkPlaylistProvider);
 
-    Q_UNUSED(from);
-    Q_UNUSED(to);
+    Q_ASSERT(from >= 0 && from < mediaCount());
+    Q_ASSERT(to >= 0 && to < mediaCount());
 
-    return true;
+    if (from == to)
+        return false;
+
+    const QMediaContent media = d->resources.at(from);
+    return removeMedia(from, from) && insertMedia(to, media);
 }
 
 bool QMediaNetworkPlaylistProvider::removeMedia(int fromPos, int toPos)