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.h | |
| 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.h')
| -rw-r--r-- | src/plugins/wmf/wmfserviceplugin.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index cd3000199..082358837 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -54,7 +54,11 @@ class WMFServicePlugin Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceDefaultDeviceInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) +#ifdef QMEDIA_MEDIAFOUNDATION_PLAYER Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "wmf.json") +#else + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "wmf_audiodecode.json") +#endif public: QMediaService* create(QString const& key); void release(QMediaService *service); |