diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /src/plugins/directshow/player/directshowplayerservice.cpp | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 05ea3e68f..fa5ce3d55 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -69,6 +69,7 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qdatetime.h> +#include <QtCore/qdir.h> #include <QtCore/qthread.h> #include <QtCore/qvarlengtharray.h> @@ -353,8 +354,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(); } |