summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 20:57:54 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-18 20:57:54 +0100
commit0354fdda8b430f7749082ca55ad6c1dc781f3918 (patch)
treed480a0b1ba868ea16d5649ca540b97b0e8369077 /src/multimedia/camera
parent51914a22de1232913f8e4be4468d676b300aed7c (diff)
parentc98c346d12b1a6ba99d18059db5b941d6138b081 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts: .qmake.conf Change-Id: I2af17ff905c26466fa1ea8b612dff3b505a3d33a
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 91ba1d566..737b74b73 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -314,7 +314,7 @@ qreal QCameraImageProcessing::denoisingLevel() const
/*!
Sets the denoising adjustment \a level.
- Valid sharpening values range between -1.0 and 1.0, with a default of 0.
+ Valid denoising values range between -1.0 and 1.0, with a default of 0.
If the parameter value is set to 0, the amount of denoising applied
is selected by camera and depends on camera capabilities and settings.