slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated IID, services, and controls to use qt-project URL

Browse Source 
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>
This commit is contained in:
Jonas Rabbe
2012-03-19 13:35:30 +10:00
committed by Qt by Nokia
parent a8ba6e3c7f
commit 7517dcca3b
99 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/audiocapture/audiocapture.json
View File

@@ -1,3 +1,3 @@
{
"Keys": ["com.nokia.qt.audiosource"]
"Keys": ["org.qt-project.qt.audiosource"]
}

2
src/plugins/audiocapture/audiocaptureserviceplugin.h
View File

@@ -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);

2
src/plugins/directshow/directshow.json
View File

@@ -1,3 +1,3 @@
{
"Keys": ["com.nokia.qt.camera", "com.nokia.qt.mediaplayer"]
"Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
}

2
src/plugins/directshow/dsserviceplugin.h
View File

@@ -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);

2
src/plugins/gstreamer/gstreamer.json
View File

@@ -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"]
}

2
src/plugins/gstreamer/qgstreamerserviceplugin.h
View File

@@ -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);

2
src/plugins/gstreamer/qgstreamervideorendererinterface.h
View File

@@ -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

2
src/plugins/m3u/qm3uhandler.h
View File

@@ -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);

2
src/plugins/pulseaudio/qpulseaudioplugin.h
View File

@@ -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);

2
src/plugins/qt7/qt7.json
View File

@@ -1,3 +1,3 @@
{
"Keys": ["com.nokia.qt.mediaplayer"]
"Keys": ["org.qt-project.qt.mediaplayer"]
}

2
src/plugins/qt7/qt7serviceplugin.h
View File

@@ -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();

2
src/plugins/qt7/qt7videooutput.h
View File

@@ -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