diff options
Diffstat (limited to 'src/imports')
12 files changed, 37 insertions, 9 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index e69851aa3..04085edfc 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \qmlclass Audio QDeclarativeAudio \brief The Audio element allows you to add audio playback to a scene. - \ingroup qml-multimedia + \ingroup multimedia_qml This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index a6d3c5f5f..0ef22e483 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -71,7 +71,8 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) /*! \qmlclass Camera QDeclarativeCamera \brief The Camera element allows you to add camera viewfinder to a scene. - \ingroup qml-multimedia + \ingroup multimedia_qml + \inherits Item This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index 79df4c393..8238ed1fb 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -49,6 +49,14 @@ QT_BEGIN_NAMESPACE +/*! + \qmlclass CameraCapture QDeclarativeCameraCapture + \brief The CameraCapture element provides an interface for camera capture related settings + \ingroup multimedia_qml + + Documentation to be written. +*/ + QDeclarativeCameraCapture::QDeclarativeCameraCapture(QCamera *camera, QObject *parent) : QObject(parent), m_camera(camera) diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index 09ad68e83..db315670d 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraExposure QDeclarativeCameraExposure \brief The CameraExposure element provides interface for exposure related camera settings. - \ingroup qml-multimedia + \ingroup multimedia_qml + This element is part of the \bold{QtMultimedia 5.0} module. @@ -68,8 +69,10 @@ QT_BEGIN_NAMESPACE */ /*! + \internal \class QDeclarativeCameraExposure \brief The CameraExposure element provides interface for exposure related camera settings. + */ /*! diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp index 0aa4876e4..bbadd30ab 100644 --- a/src/imports/multimedia/qdeclarativecameraflash.cpp +++ b/src/imports/multimedia/qdeclarativecameraflash.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraFlash QDeclarativeCameraFlash \brief The CameraFlash element provides interface for flash related camera settings. - \ingroup qml-multimedia + \ingroup multimedia_qml This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index cadeef702..4be4dd975 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass CameraFocus QDeclarativeCameraFocus \brief The CameraFocus element provides interface for focus related camera settings. - \ingroup qml-multimedia + \ingroup multimedia_qml This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp index f67c013aa..adbe47dca 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp @@ -44,6 +44,14 @@ QT_BEGIN_NAMESPACE +/*! + \qmlclass CameraImageProcessing QDeclarativeCameraImageProcessing + \brief The CameraCapture element provides an interface for camera capture related settings + \ingroup multimedia_qml + + Documentation to be written. +*/ + QDeclarativeCameraImageProcessing::QDeclarativeCameraImageProcessing(QCamera *camera, QObject *parent) : QObject(parent) { diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index 19f71b594..9e15d5596 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -46,6 +46,14 @@ QT_BEGIN_NAMESPACE +/*! + \qmlclass CameraRecorder QDeclarativeCameraRecorder + \brief The CameraRecorder element provides an interface for camera movie recording related settings + \ingroup multimedia_qml + + Documentation to be written. +*/ + QDeclarativeCameraRecorder::QDeclarativeCameraRecorder(QCamera *camera, QObject *parent) : QObject(parent) { diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index b9e657a75..046eb74ae 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Radio QDeclarativeRadio \brief The Radio element allows you to access radio functionality from a QML application. - \ingroup qml-multimedia + \ingroup multimedia_qml \inherits Item This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index 9d6d17a7b..1bd371b1b 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass RadioData QDeclarativeRadioData \brief The RadioData element allows you to access RDS data from a QML application. - \ingroup qml-multimedia + \ingroup multimedia_qml \inherits Item This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index 7ccda11bf..a013fcbc6 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -70,7 +70,7 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString) \qmlclass Video QDeclarativeVideo \brief The Video element allows you to add videos to a scene. \inherits Item - \ingroup qml-multimedia + \ingroup multimedia_qml This element is part of the \bold{QtMultimedia 5.0} module. diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index 3625cde22..dc2ab195c 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -119,7 +119,7 @@ private: \qmlclass VideoOutput QDeclarativeVideoOutput \brief The VideoOutput element allows you to render video or camera viewfinder. - \ingroup qml-multimedia + \ingroup multimedia_qml This element is part of the \bold{QtMultimedia 5.0} module. |