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>

doc/src/snippets/multimedia-snippets/media.cpp

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

src/multimedia/audio/qaudiosystemplugin.h

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

src/multimedia/controls/qaudiodecodercontrol_p.cpp

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

src/multimedia/controls/qaudiodecodercontrol_p.h

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

src/multimedia/controls/qaudioencodercontrol.cpp

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

src/multimedia/controls/qaudioencodercontrol.h

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

src/multimedia/controls/qcameracapturebufferformatcontrol.cpp

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

src/multimedia/controls/qcameracapturebufferformatcontrol.h

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

src/multimedia/controls/qcameracapturedestinationcontrol.cpp

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

src/multimedia/controls/qcameracapturedestinationcontrol.h

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

src/multimedia/controls/qcameracontrol.cpp

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

src/multimedia/controls/qcameracontrol.h

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

src/multimedia/controls/qcameraexposurecontrol.cpp

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

src/multimedia/controls/qcameraexposurecontrol.h

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

src/multimedia/controls/qcamerafeedbackcontrol.cpp

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

src/multimedia/controls/qcamerafeedbackcontrol.h

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

src/multimedia/controls/qcameraflashcontrol.cpp

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

src/multimedia/controls/qcameraflashcontrol.h

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

src/multimedia/controls/qcamerafocuscontrol.cpp

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

src/multimedia/controls/qcamerafocuscontrol.h

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

src/multimedia/controls/qcameraimagecapturecontrol.cpp

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

src/multimedia/controls/qcameraimagecapturecontrol.h

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

src/multimedia/controls/qcameraimageprocessingcontrol.cpp

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

src/multimedia/controls/qcameraimageprocessingcontrol.h

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

src/multimedia/controls/qcameralockscontrol.cpp

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

src/multimedia/controls/qcameralockscontrol.h

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

src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp

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

src/multimedia/controls/qcameraviewfinderresolutioncontrol.h

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

src/multimedia/controls/qcamerazoomcontrol.cpp

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

src/multimedia/controls/qcamerazoomcontrol.h

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

src/multimedia/controls/qimageencodercontrol.cpp

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

src/multimedia/controls/qimageencodercontrol.h

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

src/multimedia/controls/qmediaaudioprobecontrol.cpp

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

src/multimedia/controls/qmediaaudioprobecontrol.h

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

src/multimedia/controls/qmediaavailabilitycontrol.cpp

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

src/multimedia/controls/qmediaavailabilitycontrol.h

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

src/multimedia/controls/qmediacontainercontrol.cpp

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

src/multimedia/controls/qmediacontainercontrol.h

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

src/multimedia/controls/qmediagaplessplaybackcontrol.cpp

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

src/multimedia/controls/qmediagaplessplaybackcontrol.h

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

src/multimedia/controls/qmedianetworkaccesscontrol.h

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

src/multimedia/controls/qmediaplayercontrol.cpp

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

src/multimedia/controls/qmediaplayercontrol.h

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

src/multimedia/controls/qmediaplaylistcontrol.cpp

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

src/multimedia/controls/qmediaplaylistcontrol_p.h

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

src/multimedia/controls/qmediaplaylistsourcecontrol.cpp

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

src/multimedia/controls/qmediaplaylistsourcecontrol_p.h

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

src/multimedia/controls/qmediarecordercontrol.cpp

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

src/multimedia/controls/qmediarecordercontrol.h

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

src/multimedia/controls/qmediastreamscontrol.cpp

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

src/multimedia/controls/qmediastreamscontrol.h

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

src/multimedia/controls/qmediavideoprobecontrol.cpp

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

src/multimedia/controls/qmediavideoprobecontrol.h

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

src/multimedia/controls/qmetadatareadercontrol.cpp

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

src/multimedia/controls/qmetadatareadercontrol.h

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

src/multimedia/controls/qmetadatawritercontrol.cpp

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

src/multimedia/controls/qmetadatawritercontrol.h

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

src/multimedia/controls/qradiodatacontrol.cpp

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

src/multimedia/controls/qradiodatacontrol.h

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

src/multimedia/controls/qradiotunercontrol.cpp

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

src/multimedia/controls/qradiotunercontrol.h

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

src/multimedia/controls/qvideodevicecontrol.cpp

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

src/multimedia/controls/qvideodevicecontrol.h

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

src/multimedia/controls/qvideoencodercontrol.cpp

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

src/multimedia/controls/qvideoencodercontrol.h

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

src/multimedia/controls/qvideorenderercontrol.cpp

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

src/multimedia/controls/qvideorenderercontrol.h

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

src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h

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

src/multimedia/gsttools_headers/qgstreamerbushelper_p.h

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

src/multimedia/playback/qaudioendpointselector.cpp

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

src/multimedia/playback/qaudioendpointselector.h

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

src/multimedia/playback/qmediaplaylistioplugin_p.h

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

src/multimedia/qmediabindableinterface.h

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

src/multimedia/qmediaserviceproviderplugin.h

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

src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h

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

src/multimediawidgets/qvideowidgetcontrol.cpp

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

src/multimediawidgets/qvideowidgetcontrol.h

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

src/multimediawidgets/qvideowindowcontrol.cpp

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

src/multimediawidgets/qvideowindowcontrol.h

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

src/plugins/audiocapture/audiocapture.json

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

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

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

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

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

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

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
 

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

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

src/plugins/qt7/qt7.json

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

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

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.cpp

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.json

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.json

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.cpp

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.json

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp

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

tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.json

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