diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:00:10 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-30 12:21:51 +0200 |
| commit | 3f17e216c9c75c667ab501a59bcb96be62e3afa1 (patch) | |
| tree | 7e20d31bae96154abd2b10e43fdfbc4f0d284c77 /src/multimedia | |
| parent | 3f12e848168f61f986f2809cd7f8dac75408548f (diff) | |
| parent | dbdcc1b099dc25ffb707a2441191463de33c51f3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I329eeefafed87ff7467d21d5d099cf9897660167
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 46c6af9ff..e23193f11 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -644,7 +644,7 @@ void QCamera::setViewfinderSettings(const QCameraViewfinderSettings &settings) If \a settings is non null, the returned list is reduced to settings matching the given partial \a settings. - The camera must be loaded before calling this function, otherwise the returned list + The status of the camera must be LoadedStatus before calling this function, otherwise the returned list is empty. \sa setViewfinderSettings(), supportedViewfinderResolutions(), supportedViewfinderFrameRateRanges(), |