diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-12-22 18:24:00 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:55:36 +0000 |
| commit | acd9a72314696d97dccc36fd491d1aff754f2606 (patch) | |
| tree | f1c6ee7f589c0dc5bfdc7f132fe3507e77e176fb /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
| parent | b3284a1583f5e3d5cef360af279cfbe473245e97 (diff) | |
Merge QCameraLocksControl into QCameraControl
Change-Id: I228b7ef5dbb3e782a4cf39605e2f33b3c93ba8a5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index df26afbdd..39a552ae8 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -49,7 +49,6 @@ #if QT_CONFIG(gstreamer_photography) #include "camerabinexposure.h" #include "camerabinfocus.h" -#include "camerabinlocks.h" #endif #include "camerabinimageprocessing.h" @@ -131,7 +130,6 @@ CameraBinSession::CameraBinSession(GstElementFactory *sourceFactory, QObject *pa #if QT_CONFIG(gstreamer_photography) m_cameraExposureControl(0), m_cameraFocusControl(0), - m_cameraLocksControl(0), #endif m_cameraSrc(0), m_videoSrc(0), @@ -240,13 +238,6 @@ CameraBinFocus *CameraBinSession::cameraFocusControl() m_cameraFocusControl = new CameraBinFocus(this); return m_cameraFocusControl; } - -CameraBinLocks *CameraBinSession::cameraLocksControl() -{ - if (!m_cameraLocksControl && photography()) - m_cameraLocksControl = new CameraBinLocks(this); - return m_cameraLocksControl; -} #endif bool CameraBinSession::setupCameraBin() |