diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/camerabin/camerabinsession.h | |
parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h index 0d66d9ee1..d5c2d7822 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.h +++ b/src/plugins/gstreamer/camerabin/camerabinsession.h @@ -40,13 +40,14 @@ #ifndef CAMERABINCAPTURESESSION_H #define CAMERABINCAPTURESESSION_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <qmediarecordercontrol.h> #include <QtCore/qurl.h> #include <QtCore/qdir.h> #include <gst/gst.h> -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) #include <gst/interfaces/photography.h> #endif @@ -93,7 +94,7 @@ public: CameraBinSession(GstElementFactory *sourceFactory, QObject *parent); ~CameraBinSession(); -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) GstPhotography *photography(); #endif GstElement *cameraBin() { return m_camerabin; } @@ -117,7 +118,7 @@ public: CameraBinVideoEncoder *videoEncodeControl() const { return m_videoEncodeControl; } CameraBinImageEncoder *imageEncodeControl() const { return m_imageEncodeControl; } -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) CameraBinExposure *cameraExposureControl(); CameraBinFlash *cameraFlashControl(); CameraBinFocus *cameraFocusControl(); @@ -238,7 +239,7 @@ private: CameraBinImageEncoder *m_imageEncodeControl; CameraBinRecorder *m_recorderControl; CameraBinContainer *m_mediaContainerControl; -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) CameraBinExposure *m_cameraExposureControl; CameraBinFlash *m_cameraFlashControl; CameraBinFocus *m_cameraFocusControl; |