diff options
author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2012-03-19 13:35:30 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 23:40:08 +0100 |
commit | 7517dcca3bf611fc9ff9a0f7cd52f3dcde140893 (patch) | |
tree | 06f554279453ed1201269ea1625c98685480084a /src/plugins | |
parent | a8ba6e3c7f181e387eb53b122d58c433b5784319 (diff) | |
download | qtmultimedia-7517dcca3bf611fc9ff9a0f7cd52f3dcde140893.tar.gz |
Updated IID, services, and controls to use qt-project URL
Instead of com.nokia.qt we should use org.qt-project.qt.
All the identifiers have also been updated to use pure lowercase, and
where used the version numbers have been updated to 5.0.
Change-Id: Ib209327f5205f5a086a5932394504a8a52e1f712
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/audiocapture/audiocapture.json | 2 | ||||
-rw-r--r-- | src/plugins/audiocapture/audiocaptureserviceplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/directshow/directshow.json | 2 | ||||
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/gstreamer/gstreamer.json | 2 | ||||
-rw-r--r-- | src/plugins/gstreamer/qgstreamerserviceplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/gstreamer/qgstreamervideorendererinterface.h | 2 | ||||
-rw-r--r-- | src/plugins/m3u/qm3uhandler.h | 2 | ||||
-rw-r--r-- | src/plugins/pulseaudio/qpulseaudioplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/qt7/qt7.json | 2 | ||||
-rw-r--r-- | src/plugins/qt7/qt7serviceplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/qt7/qt7videooutput.h | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/audiocapture/audiocapture.json b/src/plugins/audiocapture/audiocapture.json index 09a8897b1..d963a2e3e 100644 --- a/src/plugins/audiocapture/audiocapture.json +++ b/src/plugins/audiocapture/audiocapture.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.audiosource"] + "Keys": ["org.qt-project.qt.audiosource"] } diff --git a/src/plugins/audiocapture/audiocaptureserviceplugin.h b/src/plugins/audiocapture/audiocaptureserviceplugin.h index dff93ca84..755d407f7 100644 --- a/src/plugins/audiocapture/audiocaptureserviceplugin.h +++ b/src/plugins/audiocapture/audiocaptureserviceplugin.h @@ -51,7 +51,7 @@ class AudioCaptureServicePlugin : public QMediaServiceProviderPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "audiocapture.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "audiocapture.json") public: QMediaService* create(QString const& key); diff --git a/src/plugins/directshow/directshow.json b/src/plugins/directshow/directshow.json index a96b09827..54c1c9f04 100644 --- a/src/plugins/directshow/directshow.json +++ b/src/plugins/directshow/directshow.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.camera", "com.nokia.qt.mediaplayer"] + "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"] } diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h index 2c0b12619..adf91daed 100644 --- a/src/plugins/directshow/dsserviceplugin.h +++ b/src/plugins/directshow/dsserviceplugin.h @@ -54,7 +54,7 @@ class DSServicePlugin Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0", FILE "directshow.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0", FILE "directshow.json") public: QMediaService* create(QString const& key); diff --git a/src/plugins/gstreamer/gstreamer.json b/src/plugins/gstreamer/gstreamer.json index 42d67a02f..3f6ccdafd 100644 --- a/src/plugins/gstreamer/gstreamer.json +++ b/src/plugins/gstreamer/gstreamer.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.mediaplayer", "com.nokia.qt.audiosource", "com.nokia.qt.camera", "com.nokia.qt.audiodecode"] + "Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource", "org.qt-project.qt.camera", "org.qt-project.qt.audiodecode"] } diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.h b/src/plugins/gstreamer/qgstreamerserviceplugin.h index 7695179af..96239a6da 100644 --- a/src/plugins/gstreamer/qgstreamerserviceplugin.h +++ b/src/plugins/gstreamer/qgstreamerserviceplugin.h @@ -60,7 +60,7 @@ class QGstreamerServicePlugin Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) Q_INTERFACES(QMediaServiceSupportedFormatsInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "gstreamer.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "gstreamer.json") public: QMediaService* create(QString const& key); void release(QMediaService *service); diff --git a/src/plugins/gstreamer/qgstreamervideorendererinterface.h b/src/plugins/gstreamer/qgstreamervideorendererinterface.h index 4b549053e..42f6d5d5a 100644 --- a/src/plugins/gstreamer/qgstreamervideorendererinterface.h +++ b/src/plugins/gstreamer/qgstreamervideorendererinterface.h @@ -68,7 +68,7 @@ public: //void readyChanged(bool); }; -#define QGstreamerVideoRendererInterface_iid "com.nokia.Qt.QGstreamerVideoRendererInterface/1.0" +#define QGstreamerVideoRendererInterface_iid "org.qt-project.qt.gstreamervideorenderer/5.0" Q_DECLARE_INTERFACE(QGstreamerVideoRendererInterface, QGstreamerVideoRendererInterface_iid) QT_END_NAMESPACE diff --git a/src/plugins/m3u/qm3uhandler.h b/src/plugins/m3u/qm3uhandler.h index b0dd29230..51b9757ba 100644 --- a/src/plugins/m3u/qm3uhandler.h +++ b/src/plugins/m3u/qm3uhandler.h @@ -50,7 +50,7 @@ QT_USE_NAMESPACE class QM3uPlaylistPlugin : public QMediaPlaylistIOPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaPlaylistIOInterface" FILE "m3u.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaplaylistio/5.0" FILE "m3u.json") public: explicit QM3uPlaylistPlugin(QObject *parent = 0); diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.h b/src/plugins/pulseaudio/qpulseaudioplugin.h index 1540f7278..3c460e9d5 100644 --- a/src/plugins/pulseaudio/qpulseaudioplugin.h +++ b/src/plugins/pulseaudio/qpulseaudioplugin.h @@ -52,7 +52,7 @@ class QPulseAudioPlugin : public QAudioSystemPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.qt.QAudioSystemFactoryInterface" FILE "pulseaudio.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.audiosystemfactory/5.0" FILE "pulseaudio.json") public: QPulseAudioPlugin(QObject *parent = 0); diff --git a/src/plugins/qt7/qt7.json b/src/plugins/qt7/qt7.json index 6758633a6..c4a27ea01 100644 --- a/src/plugins/qt7/qt7.json +++ b/src/plugins/qt7/qt7.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.mediaplayer"] + "Keys": ["org.qt-project.qt.mediaplayer"] } diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h index ef8bed151..90d33245a 100644 --- a/src/plugins/qt7/qt7serviceplugin.h +++ b/src/plugins/qt7/qt7serviceplugin.h @@ -54,7 +54,7 @@ class QT7ServicePlugin { Q_OBJECT Q_INTERFACES(QMediaServiceFeaturesInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "qt7.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "qt7.json") public: QT7ServicePlugin(); diff --git a/src/plugins/qt7/qt7videooutput.h b/src/plugins/qt7/qt7videooutput.h index 86c9736d2..242b2e425 100644 --- a/src/plugins/qt7/qt7videooutput.h +++ b/src/plugins/qt7/qt7videooutput.h @@ -66,7 +66,7 @@ public: }; #define QT7VideoOutput_iid \ - "com.nokia.Qt.QT7VideoOutput/1.0" + "org.qt-project.qt.QT7VideoOutput/5.0" Q_DECLARE_INTERFACE(QT7VideoOutput, QT7VideoOutput_iid) class QT7VideoWindowControl : public QVideoWindowControl, public QT7VideoOutput |