diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:29:47 +0200 |
| commit | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (patch) | |
| tree | 23362a67d26b7b295a04e8cbacd64ee20393f990 /src/multimedia | |
| parent | 0f47f44d2fc7b3fac7fdd8ee6eeafd767c43ec2e (diff) | |
| parent | 256ee311b936d69561e97f7f8ee832cff93cb509 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
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) |