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/wmfserviceplugin.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/wmfserviceplugin.cpp')
-rw-r--r-- | src/plugins/wmf/wmfserviceplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/plugins/wmf/wmfserviceplugin.cpp index ada1c8069..c6597ed78 100644 --- a/src/plugins/wmf/wmfserviceplugin.cpp +++ b/src/plugins/wmf/wmfserviceplugin.cpp @@ -97,9 +97,11 @@ void WMFServicePlugin::release(QMediaService *service) QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures( const QByteArray &service) const { +#ifdef QMEDIA_MEDIAFOUNDATION_PLAYER if (service == Q_MEDIASERVICE_MEDIAPLAYER) return QMediaServiceProviderHint::StreamPlayback; else +#endif return QMediaServiceProviderHint::Features(); } |