diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
| commit | f9014d136f504c6377d1329c822f11a8b58ccdbe (patch) | |
| tree | 1c1a752d8ba6b5094b182305d65ca0d0101e1ed0 /src/multimedia/camera | |
| parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) | |
| parent | 06259f1dfbd9cb2ebd58bba59381a42dc8a758df (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index ea1f7808b..ea3a54981 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -488,11 +488,8 @@ void QCameraImageCapture::setCaptureDestination(QCameraImageCapture::CaptureDest \property QCameraImageCapture::readyForCapture \brief whether the service is ready to capture a an image immediately. - It's permissible to call capture() while the camera status is QCamera::ActiveStatus - regardless of isReadyForCapture property value. - If camera is not ready to capture image immediately, - the capture request is queued with all the related camera settings - to be executed as soon as possible. + Calling capture() while \e readyForCapture is \c false is not permitted and + results in an error. */ bool QCameraImageCapture::isReadyForCapture() const @@ -523,11 +520,13 @@ bool QCameraImageCapture::isReadyForCapture() const the default directory, with a full path reported with imageCaptured() and imageSaved() signals. QCamera saves all the capture parameters like exposure settings or - image processing parameters, so changes to camera paramaters after + image processing parameters, so changes to camera parameters after capture() is called do not affect previous capture requests. QCameraImageCapture::capture returns the capture Id parameter, used with imageExposed(), imageCaptured() and imageSaved() signals. + + \sa isReadyForCapture() */ int QCameraImageCapture::capture(const QString &file) { |