summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-01-16 16:27:32 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-17 01:57:58 +0100
commit508ca281961a9dd59f21218adfa2305b6a4c8ac1 (patch)
tree0405a1f39ed151d722a3f19ce5a461238f8512b2 /src/multimedia/camera
parent53d71baed324d43bf5bac1fd50fc2eb4764b3857 (diff)
Fix up a few doc issues
* lingering references to Mobility * missing group tags on some classes meant they went missing * put classes into functional groups as well (e.g. audio, camera) * added some of the qdoc files to OTHER_FILES so they show up in Creator There are still a lot of warnings since it seems like qdoc is not processing the controls directory. Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r--src/multimedia/camera/qcamera.cpp3
-rw-r--r--src/multimedia/camera/qcameraexposure.cpp3
-rw-r--r--src/multimedia/camera/qcamerafocus.cpp3
-rw-r--r--src/multimedia/camera/qcameraimagecapture.cpp3
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp3
5 files changed, 10 insertions, 5 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 3df593b31..dab990c06 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -81,7 +81,8 @@ QT_BEGIN_NAMESPACE
\brief The QCamera class provides interface for system camera devices.
\inmodule QtMultimedia
- \ingroup camera
+ \ingroup multimedia
+ \ingroup multimedia_camera
QCamera can be used with QVideoWidget for viewfinder display,
QMediaRecorder for video recording and QCameraImageCapture for image taking.
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 7870aba27..cba8f95dc 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -58,7 +58,8 @@ QT_BEGIN_NAMESPACE
\brief The QCameraExposure class provides interface for exposure related camera settings.
\inmodule QtMultimedia
- \ingroup camera
+ \ingroup multimedia
+ \ingroup multimedia_camera
*/
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 3b7f3b042..5ee06b988 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -110,7 +110,8 @@ public:
\brief The QCameraFocusZone class provides information on zones used for autofocusing a camera.
\inmodule QtMultimedia
- \ingroup camera
+ \ingroup multimedia
+ \ingroup multimedia_camera
For cameras that support autofocusing, in order for a camera to autofocus on
part of a sensor frame, it considers different zones within the frame. Which
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index b90d620a1..cb4deeb6e 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -59,7 +59,8 @@ QT_BEGIN_NAMESPACE
/*!
\class QCameraImageCapture
\inmodule QtMultimedia
- \ingroup camera
+ \ingroup multimedia
+ \ingroup multimedia_camera
\brief The QCameraImageCapture class is used for the recording of media content.
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index ae6bd7384..ba12406b9 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -74,7 +74,8 @@ QT_BEGIN_NAMESPACE
image processing related camera settings.
\inmodule QtMultimedia
- \ingroup camera
+ \ingroup multimedia
+ \ingroup multimedia_camera
After capturing the data for a camera frame, the camera hardware and
software performs various image processing tasks to produce a final