diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:04 +0200 |
| commit | 256ee311b936d69561e97f7f8ee832cff93cb509 (patch) | |
| tree | d02c2a997092b08fc461ef3e1471bb05ffb296df /src/multimedia | |
| parent | 3ec70d3a2bda558d19396f1394294a3a0a4d7761 (diff) | |
| parent | e535480e13c2ba0483f4a25be90c5db82529c25c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/playback/qmediaplaylist.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 4ffcad398..97fe75044 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -448,10 +448,12 @@ bool QMediaPlaylist::clear() bool QMediaPlaylistPrivate::readItems(QMediaPlaylistReader *reader) { + QList<QMediaContent> items; + while (!reader->atEnd()) - playlist()->addMedia(reader->readItem()); + items.append(reader->readItem()); - return true; + return playlist()->addMedia(items); } bool QMediaPlaylistPrivate::writeItems(QMediaPlaylistWriter *writer) |