summaryrefslogtreecommitdiff
path: root/examples/multimediawidgets/camera/doc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2014-04-09 17:02:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-14 06:45:43 +0200
commitaf73d55efffa1dca928038cd4f392eb7def7c7e1 (patch)
treea11e18d075a2cc9f4dbf0e14612b7a2118b3cedc /examples/multimediawidgets/camera/doc
parentb33e6d46726ee275eaa00be8800339f1fce4585e (diff)
downloadqtmultimedia-af73d55efffa1dca928038cd4f392eb7def7c7e1.tar.gz
Doc: Improved example documentation
-added instructions on how to run the example (using \include to insert a section from qtbase/doc/global/) -updated copyright year -removed links to Qt 4 API -rearranged some of the sections -created links from the example pages to Qt Multimedia -fixed QDoc warnings related to the example pages Task-number: QTBUG-33597 Change-Id: Id45ce5cbd40dbfa384abd7260a316f6f6837c186 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'examples/multimediawidgets/camera/doc')
-rw-r--r--examples/multimediawidgets/camera/doc/src/camera.qdoc8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index d1a855d4e..5f6683484 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -35,10 +35,12 @@
\brief The Camera Example shows how to use the API to capture a still image
or video.
-The Camera Example demonstrates how you can use Qt Multimedia to implement
+The Camera Example demonstrates how you can use \l{Qt Multimedia} to implement
some basic Camera functionality to take still images and record video clips
with audio.
+\include examples-run.qdocinc
+
A Camera class is created that will act as our Camera. It has a user interface,
control functions, setting values and a means of defining the location where
the image or video clip is to be saved. It will also store the image and video
@@ -74,5 +76,3 @@ is started with a call to \l {QMediaRecorder::record()}.
\image camera-example.png
*/
-
-