diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2013-02-28 15:28:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 16:50:37 +0100 |
| commit | e747d4c0cd09c0874c7a268b06dd45fadb1111aa (patch) | |
| tree | 794bde338cacb942d7f2f5cb8f0e42949d910b7b /src/plugins/gstreamer/camerabin/camerabin.pro | |
| parent | 339fda0ca9d622f3525b58e91dbf78f65b44bcc2 (diff) | |
GStreamer: fixed build when using GST_PHOTOGRAPHY.
CameraBinExposure was reimplementing the Qt4 version of
QCameraExposureControl instead of the refactored version of Qt5.
Zoom features were still handled in CameraBinFocus but these have been
moved to their own control in Qt5.
Task-number: QTBUG-29300
Change-Id: I0c71cac6011137bc5457f0d362da44c72039004a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabin.pro')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabin.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index 7f84fe54d..27c368e86 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -65,13 +65,15 @@ have_gst_photography { $$PWD/camerabinfocus.h \ $$PWD/camerabinexposure.h \ $$PWD/camerabinflash.h \ - $$PWD/camerabinlocks.h + $$PWD/camerabinlocks.h \ + $$PWD/camerabinzoom.h SOURCES += \ $$PWD/camerabinexposure.cpp \ $$PWD/camerabinflash.cpp \ $$PWD/camerabinfocus.cpp \ - $$PWD/camerabinlocks.cpp + $$PWD/camerabinlocks.cpp \ + $$PWD/camerabinzoom.cpp LIBS += -lgstphotography-0.10 DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API |