From 7517dcca3bf611fc9ff9a0f7cd52f3dcde140893 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Mon, 19 Mar 2012 13:35:30 +1000 Subject: 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 --- src/multimediawidgets/qvideowidgetcontrol.cpp | 4 ++-- src/multimediawidgets/qvideowidgetcontrol.h | 2 +- src/multimediawidgets/qvideowindowcontrol.cpp | 4 ++-- src/multimediawidgets/qvideowindowcontrol.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/multimediawidgets') diff --git a/src/multimediawidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp index 0b98b8695..9c68c945e 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.cpp +++ b/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. diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index da47c3c7b..eb1fdbc17 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/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 diff --git a/src/multimediawidgets/qvideowindowcontrol.cpp b/src/multimediawidgets/qvideowindowcontrol.cpp index 3c56096cd..a4ed8eca3 100644 --- a/src/multimediawidgets/qvideowindowcontrol.cpp +++ b/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. diff --git a/src/multimediawidgets/qvideowindowcontrol.h b/src/multimediawidgets/qvideowindowcontrol.h index e895f0bf7..97c41a128 100644 --- a/src/multimediawidgets/qvideowindowcontrol.h +++ b/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 -- cgit v1.2.3