diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 15:27:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-18 15:27:54 +0000 |
| commit | bcdfb1e6b9c81d7b63554531fc63084625d4f191 (patch) | |
| tree | aa04d1b5a84a30c374be6f02a4c6ca138a333475 /src | |
| parent | 88c3398e0e7cb8efa5dd0044ee65a7cee74d4fd0 (diff) | |
| parent | 04e36a02f2134e0619b44aac2243cb22e106d63c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src')
| -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(); |