From 26d8bedc39c458768b630e939d628600540ac497 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Wed, 31 Aug 2011 17:37:58 +1000 Subject: Move the backend specific documentation into a nicer place. We really don't need to bore the 99.9% of people who won't care. And it's certainly not more important than camera. Reviewed-by: Derick Hawcroft (cherry picked from commit 51e3a1bc45ffc2688fcd3949216aedda4c41bf81) Change-Id: I8add47e42c2c06bf5e16f406604a19531af6901e Reviewed-on: http://codereview.qt-project.org/5501 Reviewed-by: Qt Sanity Bot Reviewed-by: Michael Goddard --- src/multimediakit/qaudioencodercontrol.cpp | 2 +- src/multimediakit/qcameracapturebufferformatcontrol.cpp | 2 +- src/multimediakit/qcameracapturedestinationcontrol.cpp | 2 +- src/multimediakit/qcameracontrol.cpp | 2 +- src/multimediakit/qcameraexposurecontrol.cpp | 2 +- src/multimediakit/qcameraflashcontrol.cpp | 2 +- src/multimediakit/qcamerafocuscontrol.cpp | 2 +- src/multimediakit/qcameraimagecapture.cpp | 2 +- src/multimediakit/qcameraimagecapturecontrol.cpp | 2 +- src/multimediakit/qcameralockscontrol.cpp | 2 +- src/multimediakit/qimageencodercontrol.cpp | 2 +- src/multimediakit/qmediacontainercontrol.cpp | 2 +- src/multimediakit/qmediacontrol.cpp | 2 +- src/multimediakit/qmedianetworkaccesscontrol.cpp | 2 +- src/multimediakit/qmediaplayercontrol.cpp | 2 +- src/multimediakit/qmediaplaylistcontrol.cpp | 2 +- src/multimediakit/qmediaplaylistsourcecontrol.cpp | 2 +- src/multimediakit/qmediarecordercontrol.cpp | 2 +- src/multimediakit/qmediaservice.cpp | 2 +- src/multimediakit/qmediaserviceprovider.cpp | 2 +- src/multimediakit/qmediastreamscontrol.cpp | 4 ++-- src/multimediakit/qmetadatawritercontrol.cpp | 2 +- src/multimediakit/qradiotunercontrol.cpp | 2 +- src/multimediakit/qvideodevicecontrol.cpp | 2 +- src/multimediakit/qvideoencodercontrol.cpp | 2 +- src/multimediakit/qvideorenderercontrol.cpp | 2 +- src/multimediakitwidgets/qvideowidgetcontrol.cpp | 2 +- src/multimediakitwidgets/qvideowindowcontrol.cpp | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/multimediakit/qaudioencodercontrol.cpp b/src/multimediakit/qaudioencodercontrol.cpp index 4c113d950..3308ac639 100644 --- a/src/multimediakit/qaudioencodercontrol.cpp +++ b/src/multimediakit/qaudioencodercontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QAudioEncoderControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 \brief The QAudioEncoderControl class provides access to the settings of a diff --git a/src/multimediakit/qcameracapturebufferformatcontrol.cpp b/src/multimediakit/qcameracapturebufferformatcontrol.cpp index f80ad9943..2a1ca909b 100644 --- a/src/multimediakit/qcameracapturebufferformatcontrol.cpp +++ b/src/multimediakit/qcameracapturebufferformatcontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE The format is of type QVideoFrame::PixelFormat. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv The interface name of QCameraCaptureBufferFormatControl is \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 as defined in QCameraCaptureBufferFormatControl_iid. diff --git a/src/multimediakit/qcameracapturedestinationcontrol.cpp b/src/multimediakit/qcameracapturedestinationcontrol.cpp index 1fcbd256b..0c2055ddd 100644 --- a/src/multimediakit/qcameracapturedestinationcontrol.cpp +++ b/src/multimediakit/qcameracapturedestinationcontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE Depending on backend capabilities capture to file, buffer or both can be supported. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv diff --git a/src/multimediakit/qcameracontrol.cpp b/src/multimediakit/qcameracontrol.cpp index 4bf236784..d091da711 100644 --- a/src/multimediakit/qcameracontrol.cpp +++ b/src/multimediakit/qcameracontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE classes that control still cameras or video cameras. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv \since 1.1 This service is provided by a QMediaService object via diff --git a/src/multimediakit/qcameraexposurecontrol.cpp b/src/multimediakit/qcameraexposurecontrol.cpp index 832ab081a..edf127de5 100644 --- a/src/multimediakit/qcameraexposurecontrol.cpp +++ b/src/multimediakit/qcameraexposurecontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \brief The QCameraExposureControl class allows controlling camera exposure parameters. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv \since 1.1 You can adjust a number of parameters that will affect images and video taken with diff --git a/src/multimediakit/qcameraflashcontrol.cpp b/src/multimediakit/qcameraflashcontrol.cpp index 27bf09a7c..66550baf5 100644 --- a/src/multimediakit/qcameraflashcontrol.cpp +++ b/src/multimediakit/qcameraflashcontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \brief The QCameraFlashControl class allows controlling a camera's flash. - \ingroup camera + \ingroup multimedia-serv \inmodule QtMultimediaKit \since 1.1 diff --git a/src/multimediakit/qcamerafocuscontrol.cpp b/src/multimediakit/qcamerafocuscontrol.cpp index 3a7386e3b..d48cd6c38 100644 --- a/src/multimediakit/qcamerafocuscontrol.cpp +++ b/src/multimediakit/qcamerafocuscontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE focusing related camera parameters. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv \since 1.1 The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as diff --git a/src/multimediakit/qcameraimagecapture.cpp b/src/multimediakit/qcameraimagecapture.cpp index 541b7db78..28372790c 100644 --- a/src/multimediakit/qcameraimagecapture.cpp +++ b/src/multimediakit/qcameraimagecapture.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraImageCapture \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup camera \since 1.1 diff --git a/src/multimediakit/qcameraimagecapturecontrol.cpp b/src/multimediakit/qcameraimagecapturecontrol.cpp index 9e19b14b4..00689ed63 100644 --- a/src/multimediakit/qcameraimagecapturecontrol.cpp +++ b/src/multimediakit/qcameraimagecapturecontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE for image capture services. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv \since 1.1 diff --git a/src/multimediakit/qcameralockscontrol.cpp b/src/multimediakit/qcameralockscontrol.cpp index 5afab47fa..03a58b162 100644 --- a/src/multimediakit/qcameralockscontrol.cpp +++ b/src/multimediakit/qcameralockscontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE classes that control still cameras or video cameras. \inmodule QtMultimediaKit - \ingroup camera + \ingroup multimedia-serv \since 1.1 This service is provided by a QMediaService object via diff --git a/src/multimediakit/qimageencodercontrol.cpp b/src/multimediakit/qimageencodercontrol.cpp index 1e6aab1c1..9eeb949ac 100644 --- a/src/multimediakit/qimageencodercontrol.cpp +++ b/src/multimediakit/qimageencodercontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QImageEncoderControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 \brief The QImageEncoderControl class provides access to the settings of a media service that diff --git a/src/multimediakit/qmediacontainercontrol.cpp b/src/multimediakit/qmediacontainercontrol.cpp index 281c957fa..1c317d915 100644 --- a/src/multimediakit/qmediacontainercontrol.cpp +++ b/src/multimediakit/qmediacontainercontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \brief The QMediaContainerControl class provides access to the output container format of a QMediaService \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 If a QMediaService supports writing encoded data it will implement diff --git a/src/multimediakit/qmediacontrol.cpp b/src/multimediakit/qmediacontrol.cpp index b7dfb3dc5..dc823a4b9 100644 --- a/src/multimediakit/qmediacontrol.cpp +++ b/src/multimediakit/qmediacontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmedianetworkaccesscontrol.cpp b/src/multimediakit/qmedianetworkaccesscontrol.cpp index 707e24c4b..3a18fab7a 100644 --- a/src/multimediakit/qmedianetworkaccesscontrol.cpp +++ b/src/multimediakit/qmedianetworkaccesscontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \class QMediaNetworkAccessControl \preliminary \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities. - \ingroup multimedia + \ingroup multimedia-serv \inmodule QtMultimediaKit \since 1.2 diff --git a/src/multimediakit/qmediaplayercontrol.cpp b/src/multimediakit/qmediaplayercontrol.cpp index 56eecfb7d..4062306a2 100644 --- a/src/multimediakit/qmediaplayercontrol.cpp +++ b/src/multimediakit/qmediaplayercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaPlayerControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmediaplaylistcontrol.cpp b/src/multimediakit/qmediaplaylistcontrol.cpp index 856502801..cf1513863 100644 --- a/src/multimediakit/qmediaplaylistcontrol.cpp +++ b/src/multimediakit/qmediaplaylistcontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaPlaylistControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmediaplaylistsourcecontrol.cpp b/src/multimediakit/qmediaplaylistsourcecontrol.cpp index 99b96fadf..3a788f486 100644 --- a/src/multimediakit/qmediaplaylistsourcecontrol.cpp +++ b/src/multimediakit/qmediaplaylistsourcecontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaPlaylistSourceControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmediarecordercontrol.cpp b/src/multimediakit/qmediarecordercontrol.cpp index d76603d75..1f98d65ac 100644 --- a/src/multimediakit/qmediarecordercontrol.cpp +++ b/src/multimediakit/qmediarecordercontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QMediaRecorderControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmediaservice.cpp b/src/multimediakit/qmediaservice.cpp index 50f6c8f70..1a7fca360 100644 --- a/src/multimediakit/qmediaservice.cpp +++ b/src/multimediakit/qmediaservice.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \brief The QMediaService class provides a common base class for media service implementations. \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qmediaserviceprovider.cpp b/src/multimediakit/qmediaserviceprovider.cpp index e9ac801c0..33ed3fbbd 100644 --- a/src/multimediakit/qmediaserviceprovider.cpp +++ b/src/multimediakit/qmediaserviceprovider.cpp @@ -85,7 +85,7 @@ public: \brief The QMediaServiceProviderHint class describes what is required of a QMediaService. \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 The QMediaServiceProvider class uses hints to select an appropriate media service. diff --git a/src/multimediakit/qmediastreamscontrol.cpp b/src/multimediakit/qmediastreamscontrol.cpp index 91aed77ab..58b935355 100644 --- a/src/multimediakit/qmediastreamscontrol.cpp +++ b/src/multimediakit/qmediastreamscontrol.cpp @@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE \preliminary \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \brief The QMediaStreamsControl class provides a media stream selection control. - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 The QMediaStreamsControl class provides descriptions of the available media streams diff --git a/src/multimediakit/qmetadatawritercontrol.cpp b/src/multimediakit/qmetadatawritercontrol.cpp index 2b7c1b2a4..3e5bf42e3 100644 --- a/src/multimediakit/qmetadatawritercontrol.cpp +++ b/src/multimediakit/qmetadatawritercontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QMetaDataWriterControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qradiotunercontrol.cpp b/src/multimediakit/qradiotunercontrol.cpp index 8587c8320..d468b0348 100644 --- a/src/multimediakit/qradiotunercontrol.cpp +++ b/src/multimediakit/qradiotunercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \class QRadioTunerControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 diff --git a/src/multimediakit/qvideodevicecontrol.cpp b/src/multimediakit/qvideodevicecontrol.cpp index 3e0c4f58c..e1c5f099d 100644 --- a/src/multimediakit/qvideodevicecontrol.cpp +++ b/src/multimediakit/qvideodevicecontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \brief The QVideoDeviceControl class provides an video device selector media control. \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 The QVideoDeviceControl class provides descriptions of the video devices diff --git a/src/multimediakit/qvideoencodercontrol.cpp b/src/multimediakit/qvideoencodercontrol.cpp index a8c3be055..b747f0ef6 100644 --- a/src/multimediakit/qvideoencodercontrol.cpp +++ b/src/multimediakit/qvideoencodercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \class QVideoEncoderControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 \brief The QVideoEncoderControl class provides access to the settings diff --git a/src/multimediakit/qvideorenderercontrol.cpp b/src/multimediakit/qvideorenderercontrol.cpp index 616485a00..0025d187f 100644 --- a/src/multimediakit/qvideorenderercontrol.cpp +++ b/src/multimediakit/qvideorenderercontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE to a video surface. \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 Using the surface() property of QVideoRendererControl a diff --git a/src/multimediakitwidgets/qvideowidgetcontrol.cpp b/src/multimediakitwidgets/qvideowidgetcontrol.cpp index d85c64def..acc4100df 100644 --- a/src/multimediakitwidgets/qvideowidgetcontrol.cpp +++ b/src/multimediakitwidgets/qvideowidgetcontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE implements a video widget. \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \since 1.0 The videoWidget() property of QVideoWidgetControl provides a pointer to a diff --git a/src/multimediakitwidgets/qvideowindowcontrol.cpp b/src/multimediakitwidgets/qvideowindowcontrol.cpp index 0adcfec06..26604496e 100644 --- a/src/multimediakitwidgets/qvideowindowcontrol.cpp +++ b/src/multimediakitwidgets/qvideowindowcontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \class QVideoWindowControl \inmodule QtMultimediaKit - \ingroup multimedia + \ingroup multimedia-serv \brief The QVideoWindowControl class provides a media control for rendering video to a window. \since 1.0 -- cgit v1.2.3