summaryrefslogtreecommitdiff
path: root/src/multimedia/doc/src/cameraoverview.qdoc
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2013-01-03 17:50:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-15 10:48:20 +0100
commit51334d299520118bbbc077696ca589f972a2f2ea (patch)
tree63e046d50210982eb88dddbd1be6d8a908ec69a5 /src/multimedia/doc/src/cameraoverview.qdoc
parent304fdbeeb14c8f9e75cda99d2e4122b4dee1d952 (diff)
downloadqtmultimedia-51334d299520118bbbc077696ca589f972a2f2ea.tar.gz
Doc: Fixed random QDoc warnings
- Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/multimedia/doc/src/cameraoverview.qdoc')
-rw-r--r--src/multimedia/doc/src/cameraoverview.qdoc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 2094b9571..71515ab19 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -104,14 +104,17 @@ In QML, you can use \l Camera and \l VideoOutput together to show a
simple viewfinder:
\qml
+import QtQuick 2.0
+import QtMultimedia 5.0
+
+VideoOutput {
+ source: camera
+
Camera {
id: camera
// You can adjust various settings in here
}
-
- VideoOutput {
- source: camera
- }
+}
\endqml
In C++, your choice depends on whether you are using widgets, or QGraphicsView.