diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
| commit | 32e49d634c5892ed98074cb3dd76a323357dfe54 (patch) | |
| tree | 252495f053b0084da47894ce1daee460abe40718 /src/multimedia | |
| parent | 5825dd2773755cea236d9816cc7541bc20f9cb80 (diff) | |
| parent | d9dd7f4896cbc0fe1dc37e517c28315419e6ffcd (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86
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(), |