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/v4l | |
| parent | aae2e2104b78117955305ff7d3b06741f4aee69e (diff) | |
| download | qtmultimedia-487010e5797da8634cdec44e94b5476695c1bd15.tar.gz | |
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/v4l')
| -rw-r--r-- | src/plugins/v4l/v4l.json | 3 | ||||
| -rw-r--r-- | src/plugins/v4l/v4lserviceplugin.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/v4l/v4lserviceplugin.h | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/v4l/v4l.json b/src/plugins/v4l/v4l.json new file mode 100644 index 000000000..f87f329c1 --- /dev/null +++ b/src/plugins/v4l/v4l.json @@ -0,0 +1,3 @@ +{ + "Keys": ["org.qt-project.qt.radio"] +} diff --git a/src/plugins/v4l/v4lserviceplugin.cpp b/src/plugins/v4l/v4lserviceplugin.cpp index a506eafff..49adbd942 100644 --- a/src/plugins/v4l/v4lserviceplugin.cpp +++ b/src/plugins/v4l/v4lserviceplugin.cpp @@ -50,12 +50,6 @@ #include <qmediaserviceprovider.h> -QStringList V4LServicePlugin::keys() const -{ - return QStringList() << - QLatin1String(Q_MEDIASERVICE_RADIO); -} - QMediaService* V4LServicePlugin::create(QString const& key) { if (key == QLatin1String(Q_MEDIASERVICE_RADIO)) @@ -78,7 +72,3 @@ QString V4LServicePlugin::deviceDescription(const QByteArray &service, const QBy { return QString(); } - - -Q_EXPORT_PLUGIN2(qtmedia_v4lengine, V4LServicePlugin); - diff --git a/src/plugins/v4l/v4lserviceplugin.h b/src/plugins/v4l/v4lserviceplugin.h index 7d83fc376..190812f30 100644 --- a/src/plugins/v4l/v4lserviceplugin.h +++ b/src/plugins/v4l/v4lserviceplugin.h @@ -51,8 +51,8 @@ class V4LServicePlugin : public QMediaServiceProviderPlugin, public QMediaServic { Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "v4l.json") public: - QStringList keys() const; QMediaService* create(QString const& key); void release(QMediaService *service); |