diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:03:28 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-01 07:28:44 +0000 |
| commit | a330616496cf14e53db344513889444c6d60e7de (patch) | |
| tree | 8e2b88bfbadfacb3c684dc7dc2fd8b18321e81ba /src/plugins/gstreamer | |
| parent | 48206ccc29154a2ebdbe14c549c84b2e590b6a06 (diff) | |
| parent | 545959e45ec86c70617f4839d20d931297c30c20 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/video/qvideoframe.h
Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
Diffstat (limited to 'src/plugins/gstreamer')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index f064c7c92..b96ba6792 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -732,7 +732,7 @@ static QList<QCameraViewfinderSettings> capsToViewfinderSettings(GstCaps *suppor QList<QCameraViewfinderSettings> CameraBinSession::supportedViewfinderSettings() const { - if (m_status == QCamera::LoadedStatus && m_supportedViewfinderSettings.isEmpty()) { + if (m_status >= QCamera::LoadedStatus && m_supportedViewfinderSettings.isEmpty()) { m_supportedViewfinderSettings = capsToViewfinderSettings(supportedCaps(QCamera::CaptureViewfinder)); } |