diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-04 19:12:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-04 19:12:22 +0200 |
| commit | 29a46aa4ac38bf9faedbaca6d1c191d38d2db079 (patch) | |
| tree | 9e98e216e4fa2374883b0f7662160399c9c3dad6 /src | |
| parent | 339944b284e9dd11302dd013f9d9a10ad0d9055a (diff) | |
| parent | 7966aca38451ed9ef32ac0fb1b344cdbf22521bb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/playback/playlistfileparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index d5889187f..237e417a6 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -73,7 +73,7 @@ protected: if (url.scheme().isEmpty()) { // Resolve it relative to root if (root.isLocalFile()) - return root.resolved(QUrl::fromLocalFile(line)); + return QUrl::fromUserInput(line, root.adjusted(QUrl::RemoveFilename).toLocalFile(), QUrl::AssumeLocalFile); else return root.resolved(url); } else if (url.scheme().length() == 1) { |