From 399500f87e29e6132902cba9e1e372fa8b49bb51 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:47:49 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/multimedia/qdeclarativecamera.cpp') diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 746e100a2..f13eb11c9 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. -- cgit v1.2.3 From 51334d299520118bbbc077696ca589f972a2f2ea Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Thu, 3 Jan 2013 17:50:32 +0100 Subject: 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 Reviewed-by: Jerome Pasion --- src/imports/multimedia/qdeclarativecamera.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/imports/multimedia/qdeclarativecamera.cpp') diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index f13eb11c9..226b99277 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -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 -- cgit v1.2.3 From 28ee5b12ff800ff25dd646730011f2d8d4ad9699 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 27 Jan 2013 12:25:02 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp Reviewed-by: Jerome Pasion --- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/multimedia/qdeclarativecamera.cpp') diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 226b99277..5c416ab10 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -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 -- cgit v1.2.3