summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-06-15 08:10:31 +0200
committerAndy Shaw <andy.shaw@qt.io>2020-06-15 09:57:59 +0200
commitf730fa8d3eaefdcd44f57c49c468344da56bb041 (patch)
tree2b6acb1d3289b1dffe5ba10960a1acb3122982e1
parentb38bcac27dd0c7f8845b4f947a0f631edc0bd33d (diff)
Doc: minor fixes re the camera documentation
Pick-to: 5.15 Change-Id: I8fbff45f5ebae681ab37cfd0ab0acb79eec88864 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r--examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc1
-rw-r--r--examples/multimediawidgets/camera/doc/src/camera.qdoc1
-rw-r--r--src/multimedia/doc/src/cameraoverview.qdoc2
3 files changed, 3 insertions, 1 deletions
diff --git a/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc b/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
index 69963c360..2818c22b0 100644
--- a/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
+++ b/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
@@ -29,6 +29,7 @@
\example multimedia/declarative-camera
\title QML Camera Example
\ingroup multimedia_examples
+\ingroup camera_examples_qml
\brief The Camera Example shows how to use the API to capture a still image
or video.
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index 26de47ccf..68e19aac3 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -32,6 +32,7 @@
\example multimediawidgets/camera
\title Camera Example
\ingroup multimedia_examples
+\ingroup camera_examples
\brief The Camera Example shows how to use the API to capture a still image
or video.
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 6962c2c48..69631fdab 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -286,7 +286,7 @@ for all of these, so you shouldn't need to adjust them unless the user wants a s
If you're taking a series of images (for example, to stitch them together for
a panoramic image), you should lock the image processing settings so that all the
-images taken appear similar with \e {QCamera::lock(QCamera::LockWhiteBalance)}/
+images taken appear similar with \e {QCamera::searchAndLock(QCamera::LockWhiteBalance)}/
\section3 Canceling Asynchronous Operations