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

Change-Id: I773db005bbdc511169917ee35eb5b517e898926b

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index a411715b8..d0c342ed4 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -67,6 +67,7 @@
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdatetime.h>
+#include <QtCore/qdir.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qvarlengtharray.h>
 
@@ -329,8 +330,10 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
 
     if (!SUCCEEDED(hr)) {
         locker->unlock();
+        const QString urlString = m_url.isLocalFile()
+            ? QDir::toNativeSeparators(m_url.toLocalFile()) : m_url.toString();
         hr = m_graph->AddSourceFilter(
-                reinterpret_cast<const OLECHAR *>(m_url.toString().utf16()), L"Source", &source);
+                reinterpret_cast<const OLECHAR *>(urlString.utf16()), L"Source", &source);
         locker->relock();
     }