diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:27:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:30:08 +0100 |
| commit | d3a2d9c96994c56d67467c131b8f080510d1a8fd (patch) | |
| tree | 088c55da965b1fb6bb327b2821afc4755eab8117 /src/plugins/wmf/sourceresolver.cpp | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
| parent | 75b4283fb05d07fb8654e031f266e9918f1ae647 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
Diffstat (limited to 'src/plugins/wmf/sourceresolver.cpp')
| -rw-r--r-- | src/plugins/wmf/sourceresolver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp index 78163e97f..f10f68c42 100644 --- a/src/plugins/wmf/sourceresolver.cpp +++ b/src/plugins/wmf/sourceresolver.cpp @@ -37,12 +37,13 @@ ** ****************************************************************************/ -#include "mfplayersession.h" #include "mfstream.h" #include "sourceresolver.h" #include <Mferror.h> #include <nserror.h> #include <QtCore/qfile.h> +#include <QtCore/qdebug.h> +#include <QtMultimedia/qmediaplayer.h> /* SourceResolver is separated from MFPlayerSession to handle the work of resolving a media source |