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/imports/multimedia/qdeclarativecamera.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/imports/multimedia/qdeclarativecamera.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 746e100a2..5c416ab10 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.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 plugins of the Qt Toolkit. @@ -151,7 +151,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus Basic camera state management, error reporting, and simple zoom properties are available in the Camera itself. For integration with C++ code, the \l mediaObject property allows you to - access the standard QtMultimedia camera controls. + access the standard Qt Multimedia camera controls. Many of the camera settings may take some time to apply, and might be limited to certain supported values depending on the hardware. Some camera settings may be @@ -630,21 +630,18 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera::opticalZoomChanged(qreal zoom) \qmlsignal Camera::opticalZoomChanged(zoom) The optical zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::digitalZoomChanged(qreal zoom) \qmlsignal Camera::digitalZoomChanged(zoom) The digital zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::maximumOpticalZoomChanged(qreal zoom) \qmlsignal Camera::maximumOpticalZoomChanged(zoom) The maximum optical zoom setting has changed to \a zoom. This @@ -653,7 +650,6 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal zoom) \qmlsignal Camera::maximumDigitalZoomChanged(zoom) The maximum digital zoom setting has changed to \a zoom. This |