diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-27 12:20:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 12:44:29 +0200 |
| commit | 487010e5797da8634cdec44e94b5476695c1bd15 (patch) | |
| tree | 352eacc906e11960e376b5ac48435070159d5369 /src/plugins/wmf | |
| parent | aae2e2104b78117955305ff7d3b06741f4aee69e (diff) | |
Remove the last remainders of the old plugin system
Port the last two currently unused plugins (v4l and wmf) over to the new plugin
format.
Fix documentation that still mentioned Q_EXPORT_PLUGIN.
Change-Id: I18200dd792e8973687e92180fc41d11395b35132
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/wmf')
| -rw-r--r-- | src/plugins/wmf/wmf.json | 3 | ||||
| -rw-r--r-- | src/plugins/wmf/wmfserviceplugin.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/wmf/wmfserviceplugin.h | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/wmf/wmf.json b/src/plugins/wmf/wmf.json new file mode 100644 index 000000000..c4a27ea01 --- /dev/null +++ b/src/plugins/wmf/wmf.json @@ -0,0 +1,3 @@ +{ + "Keys": ["org.qt-project.qt.mediaplayer"] +} diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/plugins/wmf/wmfserviceplugin.cpp index 188651649..6876d28d0 100644 --- a/src/plugins/wmf/wmfserviceplugin.cpp +++ b/src/plugins/wmf/wmfserviceplugin.cpp @@ -49,15 +49,6 @@ #endif #include <qmediaserviceprovider.h> -QStringList WMFServicePlugin::keys() const -{ - return QStringList() -#ifdef QMEDIA_MEDIAFOUNDATION_PLAYER - << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER) -#endif - ; -} - QMediaService* WMFServicePlugin::create(QString const& key) { #ifdef QMEDIA_MEDIAFOUNDATION_PLAYER @@ -93,5 +84,3 @@ QString WMFServicePlugin::deviceDescription(const QByteArray &service, const QBy return QString(); } -Q_EXPORT_PLUGIN2(qtmedia_wmfengine, WMFServicePlugin); - diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index d9e1efa9a..e2672db1a 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -54,8 +54,8 @@ class WMFServicePlugin Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "wmf.json") public: - QStringList keys() const; QMediaService* create(QString const& key); void release(QMediaService *service); |