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/controls/qcameraimagecapturecontrol.cpp | |
parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) | |
parent | 06259f1dfbd9cb2ebd58bba59381a42dc8a758df (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
Diffstat (limited to 'src/multimedia/controls/qcameraimagecapturecontrol.cpp')
-rw-r--r-- | src/multimedia/controls/qcameraimagecapturecontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index ee6189bcc..5d5bc6e8a 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -111,7 +111,7 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() The Camera service should save all the capture parameters like exposure settings or image processing parameters, - so changes to camera paramaters after capture() is called + so changes to camera parameters after capture() is called do not affect previous capture requests. Returns the capture request id number, which is used later |