Updated IID, services, and controls to use qt-project URL
authorJonas Rabbe <jonas.rabbe@nokia.com>
Mon, 19 Mar 2012 03:35:30 +0000 (13:35 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 20 Mar 2012 22:40:08 +0000 (23:40 +0100)
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>
99 files changed:
doc/src/snippets/multimedia-snippets/media.cpp
src/multimedia/audio/qaudiosystemplugin.h
src/multimedia/controls/qaudiodecodercontrol_p.cpp
src/multimedia/controls/qaudiodecodercontrol_p.h
src/multimedia/controls/qaudioencodercontrol.cpp
src/multimedia/controls/qaudioencodercontrol.h
src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
src/multimedia/controls/qcameracapturebufferformatcontrol.h
src/multimedia/controls/qcameracapturedestinationcontrol.cpp
src/multimedia/controls/qcameracapturedestinationcontrol.h
src/multimedia/controls/qcameracontrol.cpp
src/multimedia/controls/qcameracontrol.h
src/multimedia/controls/qcameraexposurecontrol.cpp
src/multimedia/controls/qcameraexposurecontrol.h
src/multimedia/controls/qcamerafeedbackcontrol.cpp
src/multimedia/controls/qcamerafeedbackcontrol.h
src/multimedia/controls/qcameraflashcontrol.cpp
src/multimedia/controls/qcameraflashcontrol.h
src/multimedia/controls/qcamerafocuscontrol.cpp
src/multimedia/controls/qcamerafocuscontrol.h
src/multimedia/controls/qcameraimagecapturecontrol.cpp
src/multimedia/controls/qcameraimagecapturecontrol.h
src/multimedia/controls/qcameraimageprocessingcontrol.cpp
src/multimedia/controls/qcameraimageprocessingcontrol.h
src/multimedia/controls/qcameralockscontrol.cpp
src/multimedia/controls/qcameralockscontrol.h
src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp
src/multimedia/controls/qcameraviewfinderresolutioncontrol.h
src/multimedia/controls/qcamerazoomcontrol.cpp
src/multimedia/controls/qcamerazoomcontrol.h
src/multimedia/controls/qimageencodercontrol.cpp
src/multimedia/controls/qimageencodercontrol.h
src/multimedia/controls/qmediaaudioprobecontrol.cpp
src/multimedia/controls/qmediaaudioprobecontrol.h
src/multimedia/controls/qmediaavailabilitycontrol.cpp
src/multimedia/controls/qmediaavailabilitycontrol.h
src/multimedia/controls/qmediacontainercontrol.cpp
src/multimedia/controls/qmediacontainercontrol.h
src/multimedia/controls/qmediagaplessplaybackcontrol.cpp
src/multimedia/controls/qmediagaplessplaybackcontrol.h
src/multimedia/controls/qmedianetworkaccesscontrol.h
src/multimedia/controls/qmediaplayercontrol.cpp
src/multimedia/controls/qmediaplayercontrol.h
src/multimedia/controls/qmediaplaylistcontrol.cpp
src/multimedia/controls/qmediaplaylistcontrol_p.h
src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
src/multimedia/controls/qmediarecordercontrol.cpp
src/multimedia/controls/qmediarecordercontrol.h
src/multimedia/controls/qmediastreamscontrol.cpp
src/multimedia/controls/qmediastreamscontrol.h
src/multimedia/controls/qmediavideoprobecontrol.cpp
src/multimedia/controls/qmediavideoprobecontrol.h
src/multimedia/controls/qmetadatareadercontrol.cpp
src/multimedia/controls/qmetadatareadercontrol.h
src/multimedia/controls/qmetadatawritercontrol.cpp
src/multimedia/controls/qmetadatawritercontrol.h
src/multimedia/controls/qradiodatacontrol.cpp
src/multimedia/controls/qradiodatacontrol.h
src/multimedia/controls/qradiotunercontrol.cpp
src/multimedia/controls/qradiotunercontrol.h
src/multimedia/controls/qvideodevicecontrol.cpp
src/multimedia/controls/qvideodevicecontrol.h
src/multimedia/controls/qvideoencodercontrol.cpp
src/multimedia/controls/qvideoencodercontrol.h
src/multimedia/controls/qvideorenderercontrol.cpp
src/multimedia/controls/qvideorenderercontrol.h
src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h
src/multimedia/gsttools_headers/qgstreamerbushelper_p.h
src/multimedia/playback/qaudioendpointselector.cpp
src/multimedia/playback/qaudioendpointselector.h
src/multimedia/playback/qmediaplaylistioplugin_p.h
src/multimedia/qmediabindableinterface.h
src/multimedia/qmediaserviceproviderplugin.h
src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
src/multimediawidgets/qvideowidgetcontrol.cpp
src/multimediawidgets/qvideowidgetcontrol.h
src/multimediawidgets/qvideowindowcontrol.cpp
src/multimediawidgets/qvideowindowcontrol.h
src/plugins/audiocapture/audiocapture.json
src/plugins/audiocapture/audiocaptureserviceplugin.h
src/plugins/directshow/directshow.json
src/plugins/directshow/dsserviceplugin.h
src/plugins/gstreamer/gstreamer.json
src/plugins/gstreamer/qgstreamerserviceplugin.h
src/plugins/gstreamer/qgstreamervideorendererinterface.h
src/plugins/m3u/qm3uhandler.h
src/plugins/pulseaudio/qpulseaudioplugin.h
src/plugins/qt7/qt7.json
src/plugins/qt7/qt7serviceplugin.h
src/plugins/qt7/qt7videooutput.h
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.json
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.json
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.json
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.json

index 9db5de652804f6d811f2969fa86c1d9e7237719c..94a2217665fc5d343de6de2d3b359e7bc632d1c2 100644 (file)
@@ -102,7 +102,7 @@ void MediaExample::MediaControl()
     {
     //! [Request control]
     QMediaPlayerControl *control = qobject_cast<QMediaPlayerControl *>(
-            mediaService->requestControl("com.nokia.Qt.QMediaPlayerControl/1.0"));
+            mediaService->requestControl("org.qt-project.qt.mediaplayercontrol/5.0"));
     //! [Request control]
     Q_UNUSED(control);
     }
index d48d89c325572d11a7e081b4d176ffa840a99d42..44e1646c66416dce16c9ed2035521091a03e6955 100644 (file)
@@ -69,7 +69,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface
 };
 
 #define QAudioSystemFactoryInterface_iid \
-    "com.nokia.qt.QAudioSystemFactoryInterface"
+    "org.qt-project.qt.audiosystemfactory/5.0"
 Q_DECLARE_INTERFACE(QAudioSystemFactoryInterface, QAudioSystemFactoryInterface_iid)
 
 class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSystemFactoryInterface
index 760d7060d602b719dc846d6a0cc7c5c14b46afea..72ecd10b7b706afca5cbe51f918cf17ad81788aa 100644 (file)
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application
     code through the QAudioDecoder class.
 
-    The interface name of QAudioDecoderControl is \c com.nokia.Qt.QAudioDecoderControl/1.0 as
+    The interface name of QAudioDecoderControl is \c org.qt-project.qt.audiodecodercontrol/5.0 as
     defined in QAudioDecoderControl_iid.
 
     \sa QMediaService::requestControl(), QAudioDecoder
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QAudioDecoderControl_iid
 
-    \c com.nokia.Qt.QAudioDecoderControl/1.0
+    \c org.qt-project.qt.audiodecodercontrol/5.0
 
     Defines the interface name of the QAudioDecoderControl class.
 
index 0c3bf26ffa26b96312bde3f52d14ca411eb26550..00f6f9552d2831a5d4f70018fe3a615671151b53 100644 (file)
@@ -101,7 +101,7 @@ protected:
     QAudioDecoderControl(QObject* parent = 0);
 };
 
-#define QAudioDecoderControl_iid "com.nokia.Qt.QAudioDecoderControl/1.0"
+#define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid)
 
 QT_END_NAMESPACE
index 99cd3d5b1a7ad8dc10e8064e9141419d5c3d008f..573dbe9f35dfa6857d1a19b14ada8749b9be3997 100644 (file)
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application code through the
     QMediaRecorder class.
 
-    The interface name of QAudioEncoderControl is \c com.nokia.Qt.QAudioEncoderControl/1.0 as
+    The interface name of QAudioEncoderControl is \c org.qt-project.qt.audioencodercontrol/5.0 as
     defined in QAudioEncoderControl_iid.
 
     \sa QMediaService::requestControl(), QMediaRecorder
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QAudioEncoderControl_iid
 
-    \c com.nokia.Qt.AudioEncoderControl/1.0
+    \c org.qt-project.qt.audioencodercontrol/5.0
 
     Defines the interface name of the QAudioEncoderControl class.
 
index fb50cf4723415758201502e23899fcf1fdf38c09..35322ff4001b3ef1003a295519ec11c97b121d5d 100644 (file)
@@ -84,7 +84,7 @@ protected:
     QAudioEncoderControl(QObject *parent = 0);
 };
 
-#define QAudioEncoderControl_iid "com.nokia.Qt.QAudioEncoderControl/1.0"
+#define QAudioEncoderControl_iid "org.qt-project.qt.audioencodercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid)
 
 QT_END_NAMESPACE
index 4c14adaf8e794b5338c0feb2854ea73b61f704ea..108a2f9afe450472bd11d247b515fe03b9d7f6b7 100644 (file)
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \ingroup multimedia_control
 
-    The interface name of QCameraCaptureBufferFormatControl is \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 as
+    The interface name of QCameraCaptureBufferFormatControl is \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 as
     defined in QCameraCaptureBufferFormatControl_iid.
 
     \sa QMediaService::requestControl()
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraCaptureBufferFormatControl_iid
 
-    \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0
+    \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0
 
     Defines the interface name of the QCameraCaptureBufferFormatControl class.
 
index 5956fe9920a5bbe2dda15e2f4afcaee30d72f633..976fbdc8762631315f2a1b6fce70dde0c6ceff34 100644 (file)
@@ -69,7 +69,7 @@ protected:
     QCameraCaptureBufferFormatControl(QObject* parent = 0);
 };
 
-#define QCameraCaptureBufferFormatControl_iid "com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0"
+#define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferFormatControl_iid)
 
 QT_END_NAMESPACE
index 0476c5d8076613bb060d7907b3ce3ccf54c270c3..8cf6a5bc1becc2501ce3a5bc49437d1a513e4186 100644 (file)
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \ingroup multimedia_control
 
-    The interface name of QCameraCaptureDestinationControl is \c com.nokia.Qt.QCameraCaptureDestinationControl/1.0 as
+    The interface name of QCameraCaptureDestinationControl is \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 as
     defined in QCameraCaptureDestinationControl_iid.
 
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraCaptureDestinationControl_iid
 
-    \c com.nokia.Qt.QCameraCaptureDestinationControl/1.0
+    \c org.qt-project.qt.cameracapturedestinationcontrol/5.0
 
     Defines the interface name of the QCameraCaptureDestinationControl class.
 
index 360d1ed290fc65c290eeebc9ab6f6f977475e92d..542c6921f0574809fad9588d822430253789d16c 100644 (file)
@@ -69,7 +69,7 @@ protected:
     QCameraCaptureDestinationControl(QObject* parent = 0);
 };
 
-#define QCameraCaptureDestinationControl_iid "com.nokia.Qt.QCameraCaptureDestinationControl/1.0"
+#define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinationControl_iid)
 
 QT_END_NAMESPACE
index 3bb9a9420849fad6aee97c9127b2aa29b53fdc50..a8d8ccdf7521f5c8145fd0e7c1ce31ebc98c5291 100644 (file)
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     This service is provided by a QMediaService object via
     QMediaService::control().  It is used by QCamera.
 
-    The interface name of QCameraControl is \c com.nokia.Qt.QCameraControl/1.0 as
+    The interface name of QCameraControl is \c org.qt-project.qt.cameracontrol/5.0 as
     defined in QCameraControl_iid.
 
 
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraControl_iid
 
-    \c com.nokia.Qt.QCameraControl/1.0
+    \c org.qt-project.qt.cameracontrol/5.0
 
     Defines the interface name of the QCameraControl class.
 
index c4bb91feb319f17cfae176fa1b2ad1566973822d..cb0e73dfdf416035ec52874d460cef703ba85541 100644 (file)
@@ -89,7 +89,7 @@ protected:
     QCameraControl(QObject* parent = 0);
 };
 
-#define QCameraControl_iid "com.nokia.Qt.QCameraControl/1.0"
+#define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid)
 
 QT_END_NAMESPACE
index f3ebeff4d6e67fa409ce762b4ccd0d2be67aedd4..5b4572dcaafa0ce4b7f6a630fd78ba4b43eadf36 100644 (file)
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
     \endtable
 
-    The interface name of QCameraExposureControl is \c com.nokia.Qt.QCameraExposureControl/1.0 as
+    The interface name of QCameraExposureControl is \c org.qt-project.qt.cameraexposurecontrol/5.0 as
     defined in QCameraExposureControl_iid.
 
     \sa QCamera
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraExposureControl_iid
 
-    \c com.nokia.Qt.QCameraExposureControl/1.0
+    \c org.qt-project.qt.cameraexposurecontrol/5.0
 
     Defines the interface name of the QCameraExposureControl class.
 
index c9e24822238e89a85f3ad5597db2dec5db8188a9..227ff036fdd6f8a249a49311c008992b9f8e560f 100644 (file)
@@ -94,7 +94,7 @@ protected:
     QCameraExposureControl(QObject* parent = 0);
 };
 
-#define QCameraExposureControl_iid "com.nokia.Qt.QCameraExposureControl/1.0"
+#define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraExposureControl, QCameraExposureControl_iid)
 
 QT_END_NAMESPACE
index f1fe45c3106fc6877b79d32d20d03bb316416174..119032be93ca658725928cc3ab20bab1446d8424 100644 (file)
@@ -67,7 +67,7 @@
     if that type of feedback can be modified.  Any attempts to change a locked feedback type will be
     ignored.
 
-    The interface name of QCameraFeedbackControl is \c com.nokia.Qt.QCameraFeedbackControl/1.0 as
+    The interface name of QCameraFeedbackControl is \c org.qt-project.qt.camerafeedbackcontrol/5.0 as
     defined in QCameraFeedbackControl_iid.
 
     \sa QCamera
@@ -98,7 +98,7 @@
 /*!
     \macro QCameraFeedbackControl_iid
 
-    \c com.nokia.Qt.QCameraFeedbackControl/1.0
+    \c org.qt-project.qt.camerafeedbackcontrol/5.0
 
     Defines the interface name of the QCameraFeedbackControl class.
 
index 0dd66c39ade69046e79ae77aea55c15607fc7814..0b68a0a9826137187e3ece50e4ed3f42ee533ca7 100644 (file)
@@ -91,7 +91,7 @@ protected:
     QCameraFeedbackControl(QObject* parent = 0);
 };
 
-#define QCameraFeedbackControl_iid "com.nokia.Qt.QCameraFeedbackControl/1.0"
+#define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid)
 
 QT_END_NAMESPACE
index 6080dfabe7920710ba5d63ecc3da9981aea2c121..b98a9fa393fbe761700fce52fcff90ebe97843c1 100644 (file)
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
     Some camera devices may not have flash hardware, or may not be configurable.  In that
     case, there will be no QCameraFlashControl available.
 
-    The interface name of QCameraFlashControl is \c com.nokia.Qt.QCameraFlashControl/1.0 as
+    The interface name of QCameraFlashControl is \c org.qt-project.qt.cameraflashcontrol/5.0 as
     defined in QCameraFlashControl_iid.
 
     \sa QCamera
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraFlashControl_iid
 
-    \c com.nokia.Qt.QCameraFlashControl/1.0
+    \c org.qt-project.qt.cameraflashcontrol/5.0
 
     Defines the interface name of the QCameraFlashControl class.
 
index 4872c9d361e6a637dd2cd550ff707d002b85524f..fbed527c7553198d6d3e4f07477901a0af0fb646 100644 (file)
@@ -75,7 +75,7 @@ protected:
     QCameraFlashControl(QObject* parent = 0);
 };
 
-#define QCameraFlashControl_iid "com.nokia.Qt.QCameraFlashControl/1.0"
+#define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid)
 
 QT_END_NAMESPACE
index 3a0bc2103833ed9c512987bde36e720cb5a2dcc8..dffcc106dce0ba86e5f784bb8743b7d24921676a 100644 (file)
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \ingroup multimedia_control
 
-    The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as
+    The interface name of QCameraFocusControl is \c org.qt-project.qt.camerafocuscontrol/5.0 as
     defined in QCameraFocusControl_iid.
 
 
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraFocusControl_iid
 
-    \c com.nokia.Qt.QCameraFocusControl/1.0
+    \c org.qt-project.qt.camerafocuscontrol/5.0
 
     Defines the interface name of the QCameraFocusControl class.
 
index 06e0cfa13a8a2de3f0388641e80a72a62aa9933a..d04be27e278f4804cb24b6ed04ddaec7b598044b 100644 (file)
@@ -84,7 +84,7 @@ protected:
     QCameraFocusControl(QObject* parent = 0);
 };
 
-#define QCameraFocusControl_iid "com.nokia.Qt.QCameraFocusControl/1.0"
+#define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid)
 
 QT_END_NAMESPACE
index 5a731682d1a613de39e4aacfb912223bfc037b94..4384c4c700e59d46405335e9c87669e29e0b1e87 100644 (file)
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \ingroup multimedia_control
 
-    The interface name of QCameraImageCaptureControl is \c com.nokia.Qt.QCameraImageCaptureControl/1.0 as
+    The interface name of QCameraImageCaptureControl is \c org.qt-project.qt.cameraimagecapturecontrol/5.0 as
     defined in QCameraImageCaptureControl_iid.
 
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraImageCaptureControl_iid
 
-    \c com.nokia.Qt.QCameraImageCaptureControl/1.0
+    \c org.qt-project.qt.cameraimagecapturecontrol/5.0
 
     Defines the interface name of the QCameraImageCaptureControl class.
 
index eb92b2afba84e83614a2c5388944bf8ab5344921..8b0cc9127a016261312e090433035885988d26d8 100644 (file)
@@ -86,7 +86,7 @@ protected:
     QCameraImageCaptureControl(QObject* parent = 0);
 };
 
-#define QCameraImageCaptureControl_iid "com.nokia.Qt.QCameraImageCaptureControl/1.0"
+#define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_iid)
 
 QT_END_NAMESPACE
index ba1eda49848544ac5dc1f49492a5a32a10c8e749..e6a1b5ac782f4379fba7567e32150f633ec447a3 100644 (file)
@@ -68,7 +68,7 @@ namespace
     for controlling image processing parameters, like white balance,
     contrast, saturation, sharpening and denoising.
 
-    The interface name of QCameraImageProcessingControl is \c com.nokia.Qt.QCameraImageProcessingControl/1.0 as
+    The interface name of QCameraImageProcessingControl is \c org.qt-project.qt.cameraimageprocessingcontrol/5.0 as
     defined in QCameraImageProcessingControl_iid.
 
     Camera service may choose the parameters of image processing pipeline depending
@@ -91,7 +91,7 @@ namespace
 /*!
     \macro QCameraImageProcessingControl_iid
 
-    \c com.nokia.Qt.QCameraImageProcessingControl/1.0
+    \c org.qt-project.qt.cameraimageprocessingcontrol/5.0
 
     Defines the interface name of the QCameraImageProcessingControl class.
 
index 41200b2d3ef84b7cb171f93b9991f961ec078582..faa3cfce8ea605918e945386ab8908923354365f 100644 (file)
@@ -88,7 +88,7 @@ protected:
     QCameraImageProcessingControl(QObject* parent = 0);
 };
 
-#define QCameraImageProcessingControl_iid "com.nokia.Qt.QCameraImageProcessingControl/1.0"
+#define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraImageProcessingControl, QCameraImageProcessingControl_iid)
 
 QT_END_NAMESPACE
index ec27618611a7e5d44132767a6c1488fb3ac3ade1..cefb8ceafc01f1d07726ef8696e7bec1265f7320 100644 (file)
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     This service is provided by a QMediaService object via
     QMediaService::control().  It is used by QCamera.
 
-    The interface name of QCameraLocksControl is \c com.nokia.Qt.QCameraLocksControl/1.0 as
+    The interface name of QCameraLocksControl is \c org.qt-project.qt.cameralockscontrol/5.0 as
     defined in QCameraLocksControl_iid.
 
 
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraLocksControl_iid
 
-    \c com.nokia.Qt.QCameraLocksControl/1.0
+    \c org.qt-project.qt.cameralockscontrol/5.0
 
     Defines the interface name of the QCameraLocksControl class.
 
index 09237d3798e94ef2835835a6e1016fdfb79c9641..4b5e7c0e502fed6e762fc9c59b603ded33208ea0 100644 (file)
@@ -74,7 +74,7 @@ protected:
     QCameraLocksControl(QObject* parent = 0);
 };
 
-#define QCameraLocksControl_iid "com.nokia.Qt.QCameraLocksControl/1.0"
+#define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid)
 
 QT_END_NAMESPACE
index 62b1c92b5ce324d57328f81a61baf2e15437ce46..3d93eda467b0acd1986ae2a0d36a4f4809265c85 100644 (file)
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraViewfinderResolutionControl class provides an abstract class
     for controlling camera viewfinder parameters.
 
-    The interface name of QCameraViewfinderResolutionControl is \c com.nokia.Qt.QCameraViewfinderResolutionControl/1.0 as
+    The interface name of QCameraViewfinderResolutionControl is \c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0 as
     defined in QCameraViewfinderResolutionControl_iid.
 
     \sa QMediaService::requestControl(), QCamera
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraViewfinderResolutionControl_iid
 
-    \c com.nokia.Qt.QCameraViewfinderResolutionControl/1.0
+    \c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0
 
     Defines the interface name of the QCameraViewfinderResolutionControl class.
 
index 4204e225f7f5e7c33ec65b9d5663df2f330eee2d..c59893f33d8ec0b8bf8dfc8bb7fb499a1a65080a 100644 (file)
@@ -66,7 +66,7 @@ protected:
 
 };
 
-#define QCameraViewfinderResolutionControl_iid "com.nokia.Qt.QCameraViewfinderControl/1.0"
+#define QCameraViewfinderResolutionControl_iid "org.qt-project.qt.cameraviewfindercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderResolutionControl, QCameraViewfinderResolutionControl_iid)
 
 QT_END_NAMESPACE
index d60cc9fb7f58348e4fa4f221b2277ba80f30ce3e..d1a07860712bad63c19db1de005184165e21df42 100644 (file)
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \ingroup multimedia_control
 
-    The interface name of QCameraZoomControl is \c com.nokia.Qt.QCameraZoomControl/1.0 as
+    The interface name of QCameraZoomControl is \c org.qt-project.qt.camerazoomcontrol/5.0 as
     defined in QCameraZoomControl_iid.
 
 
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QCameraZoomControl_iid
 
-    \c com.nokia.Qt.QCameraZoomControl/1.0
+    \c org.qt-project.qt.camerazoomcontrol/5.0
 
     Defines the interface name of the QCameraZoomControl class.
 
index c2cbd57a66d581b847477b9b5c3f171a6b7b5e64..b582d011170309fe46c9df03e4b40a7bc1686239 100644 (file)
@@ -82,7 +82,7 @@ protected:
     QCameraZoomControl(QObject* parent = 0);
 };
 
-#define QCameraZoomControl_iid "com.nokia.Qt.QCameraZoomControl/1.0"
+#define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid)
 
 QT_END_NAMESPACE
index e53861a78c02fab5ec2f5abbdf1dbfc4b0430dc4..e1ac8a919cc67f41575e4338326d48b2e028e154 100644 (file)
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     provides functions for quering supported image \l {supportedImageCodecs()}{codecs} and
     \l {supportedResolutions()}{resolutions}.
 
-    The interface name of QImageEncoderControl is \c com.nokia.Qt.QImageEncoderControl/1.0 as
+    The interface name of QImageEncoderControl is \c org.qt-project.qt.imageencodercontrol/5.0 as
     defined in QImageEncoderControl_iid.
 
     \sa QImageEncoderSettings, QMediaService::requestControl()
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QImageEncoderControl_iid
 
-    \c com.nokia.Qt.QImageEncoderControl/1.0
+    \c org.qt-project.qt.imageencodercontrol/5.0
 
     Defines the interface name of the QImageEncoderControl class.
 
index d46ff55ca366e8855df17ed67115a7daba344413..555338fc4865b7c92144b2872b2d44d5155576f4 100644 (file)
@@ -80,7 +80,7 @@ protected:
     QImageEncoderControl(QObject *parent = 0);
 };
 
-#define QImageEncoderControl_iid "com.nokia.Qt.QImageEncoderControl/1.0"
+#define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)
 
 QT_END_NAMESPACE
index 3068fd30ccdc8ea94e705b8f353976dfbbcda1d1..ba9a1b700b60877cabf82c0763230182df2f135b 100644 (file)
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \l QAudioProbe is the client facing class for probing audio - this class is implemented by
     media backends to provide this functionality.
 
-    The interface name of QMediaAudioProbeControl is \c com.nokia.Qt.QMediaAudioProbeControl/1.0 as
+    The interface name of QMediaAudioProbeControl is \c org.qt-project.qt.mediaaudioprobecontrol/5.0 as
     defined in QMediaAudioProbeControl_iid.
 
     \sa QAudioProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaAudioProbeControl_iid
 
-    \c com.nokia.Qt.QMediaAudioProbeControl/1.0
+    \c org.qt-project.qt.mediaaudioprobecontrol/5.0
 
     Defines the interface name of the QMediaAudioProbeControl class.
 
index f5359b9adc9840052020728f3868154e6642513f..42eccf0b37da697e15ad382822b5dd9da327eee5 100644 (file)
@@ -65,7 +65,7 @@ protected:
     explicit QMediaAudioProbeControl(QObject *parent = 0);
 };
 
-#define QMediaAudioProbeControl_iid "com.nokia.Qt.QMediaAudioProbeControl/1.0"
+#define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid)
 
 QT_END_NAMESPACE
index 76f615049ef4dd19d09f2485671fa0cf34f20636..9a0c1ca05fa983f25cd06f795c05b9ad8877e856 100644 (file)
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     An instance of QMediaObject (or its derived classes) can report any changes
     in availability via this control.
 
-    The interface name of QMediaAvailabilityControl is \c com.nokia.Qt.QMediaAvailabilityControl/1.0 as
+    The interface name of QMediaAvailabilityControl is \c org.qt-project.qt.mediaavailabilitycontrol/5.0 as
     defined in QMediaAvailabilityControl_iid.
 
     \sa QMediaService::requestControl(), QMediaObject
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaAvailabilityControl_iid
 
-    \c com.nokia.Qt.QMediaAvailabilityControl/1.0
+    \c org.qt-project.qt.mediaavailabilitycontrol/5.0
 
     Defines the interface name of the QMediaAvailabilityControl class.
 
index 4b0b8a024a57490dc6e0ba019e3e394ac6a576df..479db49167e6e20913b42b4e92b77a08d5b30e09 100644 (file)
@@ -68,7 +68,7 @@ protected:
     QMediaAvailabilityControl(QObject* parent = 0);
 };
 
-#define QMediaAvailabilityControl_iid "com.nokia.Qt.QMediaAvailabilityControl/1.0"
+#define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid)
 
 QT_END_NAMESPACE
index 647ba0ce1cea11cf4af0220a6319c41864f55e0a..0f41daaf6299919c52c0215c4bd4482c76780841 100644 (file)
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application code
     through the QMediaRecorder class.
 
-    The interface name of QMediaContainerControl is \c com.nokia.Qt.QMediaContainerControl/1.0 as
+    The interface name of QMediaContainerControl is \c org.qt-project.qt.mediacontainercontrol/5.0 as
     defined in QMediaContainerControl_iid.
 
     \sa QMediaService::requestControl(), QMediaRecorder
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaContainerControl_iid
 
-    \c com.nokia.Qt.QMediaContainerControl/1.0
+    \c org.qt-project.qt.mediacontainercontrol/5.0
 
     Defines the interface name of the QMediaContainerControl class.
 
index 85582d5215bc9fee2eb5efe6c3982362e58db884..16a9fba6e82afcfc99f4a317fd49d7317781e65f 100644 (file)
@@ -69,7 +69,7 @@ protected:
     QMediaContainerControl(QObject *parent = 0);
 };
 
-#define QMediaContainerControl_iid "com.nokia.Qt.QMediaContainerControl/1.0"
+#define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)
 
 QT_END_NAMESPACE
index 2c4b0b068418429d2ed1802bd52e917d19e0f9e9..0b8be4cbf81918a402a40b1cf65f7bda57d981b9 100644 (file)
@@ -60,7 +60,7 @@
     code through the QMediaPlayer class.
 
     The interface name of QMediaGaplessPlaybackControl is
-    \c com.nokia.Qt.QMediaGaplessPlaybackControl/1.0 as defined in QMediaGaplessPlaybackControl_iid.
+    \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0 as defined in QMediaGaplessPlaybackControl_iid.
 
     \sa QMediaService::requestControl(), QMediaPlayer
 */
@@ -68,7 +68,7 @@
 /*!
     \macro QMediaGaplessPlaybackControl_iid
 
-    \c com.nokia.Qt.QMediaGaplessPlaybackControl/1.0
+    \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0
 
     Defines the interface name of the QMediaGaplessPlaybackControl class.
 
index 735a887cc6b01b739c4b8c745fe95b26ae6e4e4a..63fc98e62373430dc1112fc22e2cbb5daa693c0d 100644 (file)
@@ -72,7 +72,7 @@ protected:
     QMediaGaplessPlaybackControl(QObject* parent = 0);
 };
 
-#define QMediaGaplessPlaybackControl_iid "com.nokia.Qt.QMediaGaplessPlaybackControl/1.0"
+#define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackControl_iid)
 
 QT_END_NAMESPACE
index 2c568f84a1a48f4a8376f20719438c60b9c85284..ad558035f9828f7d4202c3338f726b2b2a3d7bb7 100644 (file)
@@ -72,7 +72,7 @@ protected:
     QMediaNetworkAccessControl(QObject *parent = 0);
 };
 
-#define QMediaNetworkAccessControl_iid "com.nokia.Qt.QMediaNetworkAccessControl/1.0"
+#define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_iid)
 
 QT_END_NAMESPACE
index edf59719195d713357edd267f932aa6751b273a7..f8d172a43ba57f38de99d5fb4a953aa54c2651de 100644 (file)
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application
     code through the QMediaPlayer class.
 
-    The interface name of QMediaPlayerControl is \c com.nokia.Qt.QMediaPlayerControl/1.0 as
+    The interface name of QMediaPlayerControl is \c org.qt-project.qt.mediaplayercontrol/5.0 as
     defined in QMediaPlayerControl_iid.
 
     \sa QMediaService::requestControl(), QMediaPlayer
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaPlayerControl_iid
 
-    \c com.nokia.Qt.QMediaPlayerControl/1.0
+    \c org.qt-project.qt.mediaplayercontrol/5.0
 
     Defines the interface name of the QMediaPlayerControl class.
 
index 271241573e5cff76b23b4642ae702a654296f0ed..b4ec3334bc9bcea698294b592e3e41c2ceb1728b 100644 (file)
@@ -119,7 +119,7 @@ protected:
     QMediaPlayerControl(QObject* parent = 0);
 };
 
-#define QMediaPlayerControl_iid "com.nokia.Qt.QMediaPlayerControl/1.0"
+#define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
 
 QT_END_NAMESPACE
index c3348551261d571626aca81ca85127619f5e3f8b..9b0e0620619a1c253343081ac68b1a4c2b9fae92 100644 (file)
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by the control is exposed to application code
     through the QMediaPlaylist class.
 
-    The interface name of QMediaPlaylistControl is \c com.nokia.Qt.QMediaPlaylistControl/1.0 as
+    The interface name of QMediaPlaylistControl is \c org.qt-project.qt.mediaplaylistcontrol/5.0 as
     defined in QMediaPlaylistControl_iid.
 
     \sa QMediaService::requestControl(), QMediaPlayer
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaPlaylistControl_iid
 
-    \c com.nokia.Qt.QMediaPlaylistControl/1.0
+    \c org.qt-project.qt.mediaplaylistcontrol/5.0
 
     Defines the interface name of the QMediaPlaylistControl class.
 
index ac2b57f172e2c4c2318cb80b0265c6c54e46f9ed..0ddb8321055a5238b88fde0cc716620a6eb280ac 100644 (file)
@@ -99,7 +99,7 @@ protected:
     QMediaPlaylistControl(QObject* parent = 0);
 };
 
-#define QMediaPlaylistControl_iid "com.nokia.Qt.QMediaPlaylistControl/1.0"
+#define QMediaPlaylistControl_iid "org.qt-project.qt.mediaplaylistcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)
 
 QT_END_NAMESPACE
index e9e815646050197be8216650291e415b7e575460..a5016df9cdbaa3044d3f869b16d7f10b11bb5957 100644 (file)
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     advance the playlist  with QMediaPlaylist::next() when playback of the
     current media is finished.
 
-    The interface name of QMediaPlaylistSourceControl is \c com.nokia.Qt.QMediaPlaylistSourceControl/1.0 as
+    The interface name of QMediaPlaylistSourceControl is \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 as
     defined in QMediaPlaylistSourceControl_iid.
 
     \sa QMediaService::requestControl(), QMediaPlayer
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaPlaylistSourceControl_iid
 
-    \c com.nokia.Qt.QMediaPlaylistSourceControl/1.0
+    \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0
 
     Defines the interface name of the QMediaPlaylistSourceControl class.
 
index be7d8a2341f938facdd322cc2e75c75f51c97f16..13de986d04b8807c9bf6296c5889e92a8b33b5ad 100644 (file)
@@ -82,7 +82,7 @@ protected:
     QMediaPlaylistSourceControl(QObject* parent = 0);
 };
 
-#define QMediaPlaylistSourceControl_iid "com.nokia.Qt.QMediaPlaylistSourceControl/1.0"
+#define QMediaPlaylistSourceControl_iid "org.qt-project.qt.mediaplaylistsourcecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl_iid)
 
 QT_END_NAMESPACE
index 6caefd9bbc6036f08193684dd84687a0e2700f22..e952c7dcbeb02006979d652c2a18f371aedcc51c 100644 (file)
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application
     code through the QMediaRecorder class.
 
-    The interface name of QMediaRecorderControl is \c com.nokia.Qt.QMediaRecorderControl/1.0 as
+    The interface name of QMediaRecorderControl is \c org.qt-project.qt.mediarecordercontrol/5.0 as
     defined in QMediaRecorderControl_iid.
 
     \sa QMediaService::requestControl(), QMediaRecorder
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaRecorderControl_iid
 
-    \c com.nokia.Qt.QMediaRecorderControl/1.0
+    \c org.qt-project.qt.mediarecordercontrol/5.0
 
     Defines the interface name of the QMediaRecorderControl class.
 
index 73e5430dfd1e50b6dd49ca98c2c555eb2332d0ac..d8e7ea5b140eebbb335a1d9c0afba110285c7777 100644 (file)
@@ -91,7 +91,7 @@ protected:
     QMediaRecorderControl(QObject* parent = 0);
 };
 
-#define QMediaRecorderControl_iid "com.nokia.Qt.QMediaRecorderControl/1.0"
+#define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)
 
 QT_END_NAMESPACE
index 6faad2f0e0af7ac273990604eedf1401a9cab318..ba06b011d025eb1ae3501dc0ea82f03e7b23fef3 100644 (file)
@@ -69,7 +69,7 @@ namespace
     The QMediaStreamsControl class provides descriptions of the available media streams
     and allows individual streams to be activated and deactivated.
 
-    The interface name of QMediaStreamsControl is \c com.nokia.Qt.MediaStreamsControl as
+    The interface name of QMediaStreamsControl is \c org.qt-project.qt.mediastreamscontrol/5.0 as
     defined in QMediaStreamsControl_iid.
 
     \sa QMediaService::requestControl()
@@ -78,7 +78,7 @@ namespace
 /*!
     \macro QMediaStreamsControl_iid
 
-    \c com.nokia.Qt.MediaStreamsControl
+    \c org.qt-project.qt.mediastreamscontrol/5.0
 
     Defines the interface name of the QMediaStreamsControl class.
 
index ad676dcae50de7adaf77d281a3fb8f0887e587b9..e429f4ca20059d40031f7d693b9d8a2d97cd9f90 100644 (file)
@@ -80,7 +80,7 @@ protected:
     QMediaStreamsControl(QObject *parent = 0);
 };
 
-#define QMediaStreamsControl_iid "com.nokia.Qt.QMediaStreamsControl/1.0"
+#define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid)
 
 QT_END_NAMESPACE
index 9a723c0a903931219e648fa21a6e24fff3dd736b..0193896cc1f8e76f66db914c6590ca3e5b5b4b82 100644 (file)
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     \l QVideoProbe is the client facing class for probing video - this class is implemented by
     media backends to provide this functionality.
 
-    The interface name of QMediaVideoProbeControl is \c com.nokia.Qt.QMediaVideoProbeControl/1.0 as
+    The interface name of QMediaVideoProbeControl is \c org.qt-project.qt.mediavideoprobecontrol/5.0 as
     defined in QMediaVideoProbeControl_iid.
 
     \sa QVideoProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMediaVideoProbeControl_iid
 
-    \c com.nokia.Qt.QMediaVideoProbeControl/1.0
+    \c org.qt-project.qt.mediavideoprobecontrol/5.0
 
     Defines the interface name of the QMediaVideoProbeControl class.
 
index d2031ca4e82b84311fb719a3828669ce0d6e2f11..ee7667e2289670f153513507c37c68af75a642cc 100644 (file)
@@ -67,7 +67,7 @@ protected:
     explicit QMediaVideoProbeControl(QObject *parent = 0);
 };
 
-#define QMediaVideoProbeControl_iid "com.nokia.Qt.QMediaVideoProbeControl/1.0"
+#define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid)
 
 QT_END_NAMESPACE
index a173a933fbf615141bec008d5f3475ed6dd47b14..01ba89ec65c96739909719d9b06bdc9eee45b614 100644 (file)
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     service may implement QMetaDataReaderControl.
 
     The interface name of QMetaDataReaderControl is
-    \c com.nokia.Qt.QMetaDataReaderControl/1.0 as defined in
+    \c org.qt-project.qt.metadatareadercontrol/5.0 as defined in
     QMetaDataReaderControl_iid.
 
     \sa QMediaService::requestControl(), QMediaObject
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMetaDataReaderControl_iid
 
-    \c com.nokia.Qt.QMetaDataReaderControl/1.0
+    \c org.qt-project.qt.metadatareadercontrol/5.0
 
     Defines the interface name of the QMetaDataReaderControl class.
 
index 331bd90a63b87e8c73ed7396e0e8a2ac69a0a83b..b40c06d1c8ac27c4f93ce66753cf13e2e68b0732 100644 (file)
@@ -79,7 +79,7 @@ protected:
     QMetaDataReaderControl(QObject *parent = 0);
 };
 
-#define QMetaDataReaderControl_iid "com.nokia.Qt.QMetaDataReaderControl/1.0"
+#define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid)
 
 QT_END_NAMESPACE
index 06439626fcb7394f23d0a3c6acd0c23b2795dc72..1fa13f743b2338edde38ab8505bf428d61e4eaea 100644 (file)
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
     potentially available in any of the media object classes.  Any media
     service may implement QMetaDataControl.
 
-    The interface name of QMetaDataWriterControl is \c com.nokia.Qt.QMetaDataWriterControl/1.0 as
+    The interface name of QMetaDataWriterControl is \c org.qt-project.qt.metadatawritercontrol/5.0 as
     defined in QMetaDataWriterControl_iid.
 
     \sa QMediaService::requestControl(), QMediaObject
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QMetaDataWriterControl_iid
 
-    \c com.nokia.Qt.QMetaDataWriterControl/1.0
+    \c org.qt-project.qt.metadatawritercontrol/5.0
 
     Defines the interface name of the QMetaDataWriterControl class.
 
index fe451d52b1ea4343e239a703bbfe5b3c3baea38c..8d09df7c8711bf27e08227b21ba63a8429520180 100644 (file)
@@ -82,7 +82,7 @@ protected:
     QMetaDataWriterControl(QObject *parent = 0);
 };
 
-#define QMetaDataWriterControl_iid "com.nokia.Qt.QMetaDataWriterControl/1.0"
+#define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid)
 
 QT_END_NAMESPACE
index 19656f6ec2c30123901c8184bfe424e9ba9b7775..778c532b0f033c964d5616fd07351c3579ac5c16 100644 (file)
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application code
     through the QRadioData class.
 
-    The interface name of QRadioDataControl is \c com.nokia.Qt.QRadioDataControl/5.0 as
+    The interface name of QRadioDataControl is \c org.qt-project.qt.radiodatacontrol/5.0 as
     defined in QRadioDataControl_iid.
 
     \sa QMediaService::requestControl(), QRadioData
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QRadioDataControl_iid
 
-    \c com.nokia.Qt.QRadioDataControl/5.0
+    \c org.qt-project.qt.radiodatacontrol/5.0
 
     Defines the interface name of the QRadioDataControl class.
 
index 11723f8c8233d6234c30320bb48fc95871202ea0..3dd65f539a05d176f4de161c3b8b7eefea65a59d 100644 (file)
@@ -83,7 +83,7 @@ protected:
     QRadioDataControl(QObject *parent = 0);
 };
 
-#define QRadioDataControl_iid "com.nokia.Qt.QRadioDataControl/5.0"
+#define QRadioDataControl_iid "org.qt-project.qt.radiodatacontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QRadioDataControl, QRadioDataControl_iid)
 
 QT_END_NAMESPACE
index c0f3cc146a8cc9c5bf25e37a2987667f255886dd..ca47ca66368b7fa8443ea482b644ba96501d1c67 100644 (file)
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application code
     through the QRadioTuner class.
 
-    The interface name of QRadioTunerControl is \c com.nokia.Qt.QRadioTunerControl/1.0 as
+    The interface name of QRadioTunerControl is \c org.qt-project.qt.radiotunercontrol/5.0 as
     defined in QRadioTunerControl_iid.
 
     \sa QMediaService::requestControl(), QRadioTuner
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QRadioTunerControl_iid
 
-    \c com.nokia.Qt.QRadioTunerControl/1.0
+    \c org.qt-project.qt.radiotunercontrol/5.0
 
     Defines the interface name of the QRadioTunerControl class.
 
index 2e64fbfaa4a2ddc45e3fd4b5aa78e68484a84ba1..a33dcabf90c6a696d0bf05b8699a2630f6d684fc 100644 (file)
@@ -114,7 +114,7 @@ protected:
     QRadioTunerControl(QObject *parent = 0);
 };
 
-#define QRadioTunerControl_iid "com.nokia.Qt.QRadioTunerControl/1.0"
+#define QRadioTunerControl_iid "org.qt-project.qt.radiotunercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)
 
 QT_END_NAMESPACE
index 028a28087a2c1517b098ef8d199f3d8af46fd758..f9fa0e9ecda9f808db9b6fefa6596aed8010490e 100644 (file)
@@ -56,14 +56,14 @@ QT_BEGIN_NAMESPACE
     available on a system and allows one to be selected as the  endpoint of a
     media service.
 
-    The interface name of QVideoDeviceControl is \c com.nokia.Qt.VideoDeviceControl as
+    The interface name of QVideoDeviceControl is \c org.qt-project.qt.videodevicecontrol/5.0 as
     defined in QVideoDeviceControl_iid.
 */
 
 /*!
     \macro QVideoDeviceControl_iid
 
-    \c com.nokia.Qt.VideoDeviceControl
+    \c org.qt-project.qt.videodevicecontrol/5.0
 
     Defines the interface name of the QVideoDeviceControl class.
 
index 9394ea840f942853b49f320a9a1a72a44bc4b129..3197ce454fc7947e156fdfd69e11963737833660 100644 (file)
@@ -77,7 +77,7 @@ protected:
     QVideoDeviceControl(QObject *parent = 0);
 };
 
-#define QVideoDeviceControl_iid "com.nokia.Qt.QVideoDeviceControl/1.0"
+#define QVideoDeviceControl_iid "org.qt-project.qt.videodevicecontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid)
 
 QT_END_NAMESPACE
index 244f27fadd2406617803dbaf021ef459fd9347ae..a5a6af71ff3bda056e12d76358f00d30e592aeb0 100644 (file)
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application code
     through the QMediaRecorder class.
 
-    The interface name of QVideoEncoderControl is \c com.nokia.Qt.QVideoEncoderControl/1.0 as
+    The interface name of QVideoEncoderControl is \c org.qt-project.qt.videoencodercontrol/5.0 as
     defined in QVideoEncoderControl_iid.
 
     \sa QMediaRecorder, QVideoEncoderSettings, QMediaService::requestControl()
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QVideoEncoderControl_iid
 
-    \c com.nokia.Qt.QVideoEncoderControl/1.0
+    \c org.qt-project.qt.videoencodercontrol/5.0
 
     Defines the interface name of the QVideoEncoderControl class.
 
index 0a86e41a0960eb9769291e1fb7dba1b27e69a6f7..ea3c49f917e85029bdaf554840d28ad6c1d20a34 100644 (file)
@@ -87,7 +87,7 @@ protected:
     QVideoEncoderControl(QObject *parent = 0);
 };
 
-#define QVideoEncoderControl_iid "com.nokia.Qt.QVideoEncoderControl/1.0"
+#define QVideoEncoderControl_iid "org.qt-project.qt.videoencodercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid)
 
 QT_END_NAMESPACE
index e217765cb648e318ce34e5cd84d5fa7b7b7e1cbe..4ee4a51fd8c6db57aa953ac23dadecef98654502 100644 (file)
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
     QVideoRendererControl is one of a number of possible video output controls.
 
-    The interface name of QVideoRendererControl is \c com.nokia.Qt.QVideoRendererControl/1.0 as
+    The interface name of QVideoRendererControl is \c org.qt-project.qt.videorenderercontrol/5.0 as
     defined in QVideoRendererControl_iid.
 
     \sa QMediaService::requestControl(), QVideoWidget
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QVideoRendererControl_iid
 
-    \c com.nokia.Qt.QVideoRendererControl/1.0
+    \c org.qt-project.qt.videorenderercontrol/5.0
 
     Defines the interface name of the QVideoRendererControl class.
 
index 5b983acdcead99bad57b83d9cba9453d6e6c1773..c93117d6c4bc82d03b414586cd2b32f4e02fd108 100644 (file)
@@ -70,7 +70,7 @@ protected:
     QVideoRendererControl(QObject *parent = 0);
 };
 
-#define QVideoRendererControl_iid "com.nokia.Qt.QVideoRendererControl/1.0"
+#define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)
 
 QT_END_NAMESPACE
index 7bb906aa58111fa82de44d3f7f229be363d79252..42c4fb55cb3ca982134d7da367af76a830224371 100644 (file)
@@ -89,7 +89,7 @@ public:
     virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0;
 };
 
-#define QGstBufferPoolInterface_iid "com.nokia.Qt.QGstBufferPoolInterface"
+#define QGstBufferPoolInterface_iid "org.qt-project.qt.gstbufferpool/5.0"
 Q_DECLARE_INTERFACE(QGstBufferPoolInterface, QGstBufferPoolInterface_iid)
 
 class QGstBufferPoolPlugin : public QObject, public QGstBufferPoolInterface
index a4f565c13b7e81af0c7a234bbf0cd13bff45ec4a..145a26f6859ee590438f06ce29df8020804f93d8 100644 (file)
@@ -65,7 +65,7 @@ public:
     //returns true if message was processed and should be dropped, false otherwise
     virtual bool processSyncMessage(const QGstreamerMessage &message) = 0;
 };
-#define QGstreamerSyncMessageFilter_iid "com.nokia.Qt.QGstreamerSyncMessageFilter/1.0"
+#define QGstreamerSyncMessageFilter_iid "org.qt-project.qt.gstreamersyncmessagefilter/5.0"
 Q_DECLARE_INTERFACE(QGstreamerSyncMessageFilter, QGstreamerSyncMessageFilter_iid)
 
 
@@ -74,7 +74,7 @@ public:
     //returns true if message was processed and should be dropped, false otherwise
     virtual bool processBusMessage(const QGstreamerMessage &message) = 0;
 };
-#define QGstreamerBusMessageFilter_iid "com.nokia.Qt.QGstreamerBusMessageFilter/1.0"
+#define QGstreamerBusMessageFilter_iid "org.qt-project.qt.gstreamerbusmessagefilter/5.0"
 Q_DECLARE_INTERFACE(QGstreamerBusMessageFilter, QGstreamerBusMessageFilter_iid)
 
 
index f66cb5bd80b357312e6ba2e71968a57891d305ec..21104ec6c4a981cfdd31ac4616bdea943f40e8b9 100644 (file)
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     endpoints available on a system and allows one to be selected as the audio
     of a media service.
 
-    The interface name of QAudioEndpointSelector is \c com.nokia.Qt.QAudioEndpointSelector/1.0 as
+    The interface name of QAudioEndpointSelector is \c org.qt-project.qt.audioendpointselector/5.0 as
     defined in QAudioEndpointSelector_iid.
 
     \sa QMediaService::requestControl()
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QAudioEndpointSelector_iid
 
-    \c com.nokia.Qt.QAudioEndpointSelector/1.0
+    \c org.qt-project.qt.audioendpointselector/5.0
 
     Defines the interface name of the QAudioEndpointSelector class.
 
index df077987564d217adf402fc4b3a1a5269b731aae..85e1ae6519faa0f96854ca7c2b966f590a506b7e 100644 (file)
@@ -75,7 +75,7 @@ protected:
     QAudioEndpointSelector(QObject *parent = 0);
 };
 
-#define QAudioEndpointSelector_iid "com.nokia.Qt.QAudioEndpointSelector/1.0"
+#define QAudioEndpointSelector_iid "org.qt-project.qt.audioendpointselector/5.0"
 Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid)
 
 QT_END_NAMESPACE
index 5371a9392628d438659600cfd1a7dbf7504bfef3..197959238c1350b4d5b48dec3b8c5f6b8af09cff 100644 (file)
@@ -104,7 +104,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
 };
 
-#define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface"
+#define QMediaPlaylistIOInterface_iid "org.qt-project.qt.mediaplaylistio/5.0"
 Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
 
 class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface
index e9a131cb8bd83d84a5b6d2aad38fca5524fc872c..d1d5696109d7d93d2738ba0d087618b1d084ea96 100644 (file)
@@ -66,7 +66,7 @@ protected:
 };
 
 #define QMediaBindableInterface_iid \
-    "com.nokia.Qt.QMediaBindableInterface/1.0"
+    "org.qt-project.qt.mediabindable/5.0"
 Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid)
 
 QT_END_NAMESPACE
index 0d98a28e96c05b5d484cde5953ee89a3ffccb878..346a4438c29a589a8251d9e3dbee0bc19b8b65f0 100644 (file)
@@ -112,7 +112,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface
 };
 
 #define QMediaServiceProviderFactoryInterface_iid \
-    "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0"
+    "org.qt-project.qt.mediaserviceproviderfactory/5.0"
 Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
 
 
@@ -124,7 +124,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 };
 
 #define QMediaServiceSupportedFormatsInterface_iid \
-    "com.nokia.Qt.QMediaServiceSupportedFormatsInterface/1.0"
+    "org.qt-project.qt.mediaservicesupportedformats/5.0"
 Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
 
 
@@ -136,7 +136,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface
 };
 
 #define QMediaServiceSupportedDevicesInterface_iid \
-    "com.nokia.Qt.QMediaServiceSupportedDevicesInterface/1.0"
+    "org.qt-project.qt.mediaservicesupporteddevices/5.0"
 Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
 
 
@@ -149,7 +149,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface
 
 
 #define QMediaServiceFeaturesInterface_iid \
-    "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0"
+    "org.qt-project.qt.mediaservicefeatures/5.0"
 Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
 
 
@@ -171,7 +171,7 @@ public:
                         Required: QVideoOutputControl
                         Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl
 */
-#define Q_MEDIASERVICE_MEDIAPLAYER "com.nokia.qt.mediaplayer"
+#define Q_MEDIASERVICE_MEDIAPLAYER "org.qt-project.qt.mediaplayer"
 
 /*!
    Service with support for recording from audio sources
@@ -181,7 +181,7 @@ public:
                         Recommended: QAudioEncoderControl
                         Optional: QMediaContainerControl
 */
-#define Q_MEDIASERVICE_AUDIOSOURCE "com.nokia.qt.audiosource"
+#define Q_MEDIASERVICE_AUDIOSOURCE "org.qt-project.qt.audiosource"
 
 /*!
     Service with support for camera use.
@@ -195,7 +195,7 @@ public:
                         Required: QVideoOutputControl
                         Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl
 */
-#define Q_MEDIASERVICE_CAMERA "com.nokia.qt.camera"
+#define Q_MEDIASERVICE_CAMERA "org.qt-project.qt.camera"
 
 /*!
     Service with support for radio tuning.
@@ -205,14 +205,14 @@ public:
                         Recommended: QAudioEncoderControl
                         Optional: QMediaContainerControl
 */
-#define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio"
+#define Q_MEDIASERVICE_RADIO "org.qt-project.qt.radio"
 
 /*!
     Service with support for decoding audio.
     Required Controls: QAudioDecoderControl
     Optional: that streams control
 */
-#define Q_MEDIASERVICE_AUDIODECODER "com.nokia.qt.audiodecode"
+#define Q_MEDIASERVICE_AUDIODECODER "org.qt-project.qt.audiodecode"
 
 
 
index 6bdfc2b915890935f7507806cc9a277a0f217425..87f15b2527b04399725d5c2062de969123aa3a3d 100644 (file)
@@ -80,7 +80,7 @@ public:
     virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0;
 };
 
-#define QSGVideoNodeFactoryInterface_iid "com.nokia.Qt.QSGVideoNodeFactoryInterface"
+#define QSGVideoNodeFactoryInterface_iid "org.qt-project.qt.sgvideonodefactory/5.0"
 Q_DECLARE_INTERFACE(QSGVideoNodeFactoryInterface, QSGVideoNodeFactoryInterface_iid)
 
 class QSGVideoNodeFactoryPlugin : public QObject, public QSGVideoNodeFactoryInterface
index 0b98b8695321c6a7a260c9e2fef8aa92052978b4..9c68c945e93e8b10579ec61b9f956ed32627d62e 100644 (file)
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
     QVideoWidgetControl is one of number of possible video output controls.
 
-    The interface name of QVideoWidgetControl is \c com.nokia.Qt.QVideoWidgetControl/1.0 as
+    The interface name of QVideoWidgetControl is \c org.qt-project.qt.videowidgetcontrol/5.0 as
     defined in QVideoWidgetControl_iid.
 
     \sa QMediaService::requestControl(), QVideoWidget
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QVideoWidgetControl_iid
 
-    \c com.nokia.Qt.QVideoWidgetControl/1.0
+    \c org.qt-project.qt.videowidgetcontrol/5.0
 
     Defines the interface name of the QVideoWidgetControl class.
 
index da47c3c7be1286a171df914e042429921079dd7d..eb1fdbc17255aea8026c6863fed63e9aed66caa0 100644 (file)
@@ -94,7 +94,7 @@ protected:
     QVideoWidgetControl(QObject *parent = 0);
 };
 
-#define QVideoWidgetControl_iid "com.nokia.Qt.QVideoWidgetControl/1.0"
+#define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid)
 
 QT_END_NAMESPACE
index 3c56096cd83f5d20956cdba33d23b6a70c1be78f..a4ed8eca335dea8b2184a4fda1aef89395d85b17 100644 (file)
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
     QVideoWindowControl is one of a number of possible video output controls.
 
-    The interface name of QVideoWindowControl is \c com.nokia.Qt.QVideoWindowControl/1.0 as
+    The interface name of QVideoWindowControl is \c org.qt-project.qt.videowindowcontrol/5.0 as
     defined in QVideoWindowControl_iid.
 
     \sa QMediaService::requestControl(), QVideoWidget
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \macro QVideoWindowControl_iid
 
-    \c com.nokia.Qt.QVideoWindowControl/1.0
+    \c org.qt-project.qt.videowindowcontrol/5.0
 
     Defines the interface name of the QVideoWindowControl class.
 
index e895f0bf790a5873618531143523b03a3dced30b..97c41a128f37344b4a28848bf12ff839dae2d00d 100644 (file)
@@ -101,7 +101,7 @@ protected:
     QVideoWindowControl(QObject *parent = 0);
 };
 
-#define QVideoWindowControl_iid "com.nokia.Qt.QVideoWindowControl/1.0"
+#define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid)
 
 QT_END_NAMESPACE
index 09a8897b1b602dd8b06541d7cefb544c13c5c7ca..d963a2e3ee5333aa8f3549d32e5d492e87b2ed53 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.audiosource"]
+    "Keys": ["org.qt-project.qt.audiosource"]
 }
index dff93ca84c7e717d6e7dfabb30334c2b93ab34e2..755d407f7dd627d85c675dba73f638f87865d0cb 100644 (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);
index a96b0982750ffddc472eda20dd8301bc68729a23..54c1c9f043aeb7c907603e93b67161d477399802 100644 (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"]
 }
index 2c0b126195c7a62054867adf26d8ac3881a8679b..adf91daeddff298a9569acb26717b0b063950ee5 100644 (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);
index 42d67a02f2cad47bacd82315810647f1c8b30e23..3f6ccdafdb52e1acf2792b3e4f4ea7986b8a5c25 100644 (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"]
 }
index 7695179af4d887b053e9f12f1a68a0209d9ef974..96239a6da29e21698d3405b1ecce5d687670efd7 100644 (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);
index 4b549053e08d721a9deb6d3ce9bb081d30c7242a..42f6d5d5a8310cc4c0a279d1a7dbd8445fd7c238 100644 (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
 
index b0dd292301c8aa9904e48f2b9b563a4de43e3945..51b9757ba7c35e23bacfb10320b236a07c6bff3f 100644 (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);
index 1540f72789eae9d16e3604eaa4d57c312362eeb4..3c460e9d5524fb8050bc8fd6cbcaab9aac8edb9c 100644 (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);
index 6758633a66df3a447add4ecde5ce55dc70f36e50..c4a27ea0138aea65b3a7ae00e85bbc9df6442dca 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.mediaplayer"]
+    "Keys": ["org.qt-project.qt.mediaplayer"]
 }
index ef8bed15194c1b35724a09545ceb298700901b26..90d33245a8daf8cf44f91adc782a06195e96d1b2 100644 (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();
index 86c9736d218235a9c74d58a35b7738f9c76fec45..242b2e4250db79cf33729a2d94fd5fe36bd8d8c2 100644 (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
index c6887c7db3650ca71fd59f528a857a500aacd0ec..9548bef63b80f5af05fe0b7a80fdc1268e71065b 100644 (file)
@@ -50,7 +50,7 @@ class MockServicePlugin1 : public QMediaServiceProviderPlugin,
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
-    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "mockserviceplugin1.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mockserviceplugin1.json")
 public:
     QStringList keys() const
     {
index 6758633a66df3a447add4ecde5ce55dc70f36e50..c4a27ea0138aea65b3a7ae00e85bbc9df6442dca 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.mediaplayer"]
+    "Keys": ["org.qt-project.qt.mediaplayer"]
 }
index 299b222f10545d681b0b9e7c46d332563a05b90c..98868c40b980093f304425db0929f24728945b45 100644 (file)
@@ -50,7 +50,7 @@ class MockServicePlugin2 : public QMediaServiceProviderPlugin,
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
     Q_INTERFACES(QMediaServiceFeaturesInterface)
-    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "mockserviceplugin2.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mockserviceplugin2.json")
 public:
     QStringList keys() const
     {
index 9472b0bf1b9a1589edb873786e4131f57de1d7be..ec05f3e521d45fbcb1879fe3b73f082adc26162c 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.mediaplayer", "com.nokia.qt.radio"]
+    "Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.radio"]
 }
index 6aae3ea8cd8927f5d42446a03f17b970c85773cb..7ab95a3932b5f983be016efbd7d81340573cfff5 100644 (file)
@@ -48,7 +48,7 @@ class MockServicePlugin3 : public QMediaServiceProviderPlugin,
 {
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
-    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "mockserviceplugin3.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mockserviceplugin3.json")
 public:
     QStringList keys() const
     {
index 9379436d65639d7e5b67fc9ed207237adf0c80f8..58bbc4d7465032b0d4cd2b477fe349eff630ed94 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.mediaplayer", "com.nokia.qt.audiosource"]
+    "Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource"]
 }
index 73daa6471b6dc8ec2e24850b0284cfc3906595ca..03dd2ea362dbb60732ea2fe751fea634b59bd657 100644 (file)
@@ -50,7 +50,7 @@ class MockServicePlugin4 : public QMediaServiceProviderPlugin,
     Q_OBJECT
     Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
     Q_INTERFACES(QMediaServiceFeaturesInterface)
-    Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "mockserviceplugin4.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mockserviceplugin4.json")
 public:
     QStringList keys() const
     {
index 6758633a66df3a447add4ecde5ce55dc70f36e50..c4a27ea0138aea65b3a7ae00e85bbc9df6442dca 100644 (file)
@@ -1,3 +1,3 @@
 {
-    "Keys": ["com.nokia.qt.mediaplayer"]
+    "Keys": ["org.qt-project.qt.mediaplayer"]
 }