diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-07-14 13:53:15 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-28 14:59:05 +0000 |
| commit | c106041bd6bfa15fa7646aafd848da3f930055ff (patch) | |
| tree | 034f14def40b1a63e85191256e1954d23a924f6d | |
| parent | 3d3d2a4967ba079a3e6df82cdc89f839865e6649 (diff) | |
| download | qtmultimedia-c106041bd6bfa15fa7646aafd848da3f930055ff.tar.gz | |
GStreamer camerabin: always provide the zoom control.
It doesn't actually require GstPhotography to be available at compile
time.
Change-Id: I738e71e4a108a40e79440096be6607afff0134fa
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index a22301e2e..f0958bc51 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -47,7 +47,6 @@ #include "camerabinflash.h" #include "camerabinfocus.h" #include "camerabinlocks.h" -#include "camerabinzoom.h" #endif #include "camerabinimagecapture.h" @@ -56,6 +55,7 @@ #include "camerabincapturedestination.h" #include "camerabinviewfindersettings.h" #include "camerabinviewfindersettings2.h" +#include "camerabinzoom.h" #include <private/qgstreamerbushelper_p.h> #include <private/qgstutils_p.h> @@ -226,10 +226,10 @@ QMediaControl *CameraBinService::requestControl(const char *name) if (qstrcmp(name, QCameraLocksControl_iid) == 0) return m_captureSession->cameraLocksControl(); +#endif if (qstrcmp(name, QCameraZoomControl_iid) == 0) return m_captureSession->cameraZoomControl(); -#endif if (qstrcmp(name, QCameraImageProcessingControl_iid) == 0) return m_captureSession->imageProcessingControl(); |