diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /src/multimedia/playback/qplaylistfileparser.cpp | |
parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'src/multimedia/playback/qplaylistfileparser.cpp')
-rw-r--r-- | src/multimedia/playback/qplaylistfileparser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp index d0617d2cf..47a3d239e 100644 --- a/src/multimedia/playback/qplaylistfileparser.cpp +++ b/src/multimedia/playback/qplaylistfileparser.cpp @@ -563,7 +563,8 @@ void QPlaylistFileParser::start(const QNetworkRequest& request, const QString &m connect(d->m_source.data(), SIGNAL(finished()), this, SLOT(handleData())); connect(d->m_source.data(), SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(handleError())); - d->handleData(); + if (url.isLocalFile()) + d->handleData(); } void QPlaylistFileParser::abort() |