diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
| commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
| tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/multimedia/camera/qcamerafocus.cpp | |
| parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/multimedia/camera/qcamerafocus.cpp')
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index fcae9f0c5..cae285167 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -162,7 +162,7 @@ public: rectangles around areas of the camera frame that are in focus, or changing the color of a zone as it comes into focus. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones + \snippet multimedia-snippets/camera.cpp Camera focus zones \sa QCameraFocus */ @@ -291,7 +291,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) interesting area of the viewfinder for the hardware to attempt to focus on. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera custom zoom + \snippet multimedia-snippets/camera.cpp Camera custom zoom Zooming can be accomplished in a number of ways - usually the more expensive but higher quality approach is an optical zoom, which allows @@ -303,7 +303,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) checked. The \l zoomTo() method allows changing both optical and digital zoom at once. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera combined zoom + \snippet multimedia-snippets/camera.cpp Camera combined zoom \section2 Some notes on autofocus Some hardware supports a movable focus lens assembly, and typically @@ -319,7 +319,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) are in focus or are being used for autofocusing via the \l focusZones() property: - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones + \snippet multimedia-snippets/camera.cpp Camera focus zones \sa QCameraFocusZone */ |