From 95de9e6154d75688e81a3b79007dfe6c56d3b65b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 21 Nov 2016 10:44:47 +0100
Subject: Use QT_CONFIG macro to check for features

And remove many custom defines.

Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
 src/plugins/gstreamer/camerabin/camerabinimageprocessing.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/plugins/gstreamer/camerabin/camerabinimageprocessing.h')

diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h
index 82c6e1678..b09c8d52b 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h
+++ b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h
@@ -40,13 +40,14 @@
 #ifndef CAMERABINIMAGEPROCESSINGCONTROL_H
 #define CAMERABINIMAGEPROCESSINGCONTROL_H
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qcamera.h>
 #include <qcameraimageprocessingcontrol.h>
 
 #include <gst/gst.h>
 #include <glib.h>
 
-#ifdef HAVE_GST_PHOTOGRAPHY
+#if QT_CONFIG(gstreamer_photography)
 # include <gst/interfaces/photography.h>
 # if !GST_CHECK_VERSION(1,0,0)
 typedef GstWhiteBalanceMode GstPhotographyWhiteBalanceMode;
@@ -56,7 +57,7 @@ typedef GstColourToneMode GstPhotographyColorToneMode;
 
 QT_BEGIN_NAMESPACE
 
-#ifdef USE_V4L
+#if QT_CONFIG(linux_v4l)
 class CameraBinV4LImageProcessing;
 #endif
 
@@ -79,7 +80,7 @@ public:
     QVariant parameter(ProcessingParameter parameter) const;
     void setParameter(ProcessingParameter parameter, const QVariant &value);
 
-#ifdef HAVE_GST_PHOTOGRAPHY
+#if QT_CONFIG(gstreamer_photography)
     void lockWhiteBalance();
     void unlockWhiteBalance();
 #endif
@@ -91,13 +92,13 @@ private:
 private:
     CameraBinSession *m_session;
     QMap<QCameraImageProcessingControl::ProcessingParameter, int> m_values;
-#ifdef HAVE_GST_PHOTOGRAPHY
+#if QT_CONFIG(gstreamer_photography)
     QMap<GstPhotographyWhiteBalanceMode, QCameraImageProcessing::WhiteBalanceMode> m_mappedWbValues;
     QMap<QCameraImageProcessing::ColorFilter, GstPhotographyColorToneMode> m_filterMap;
 #endif
     QCameraImageProcessing::WhiteBalanceMode m_whiteBalanceMode;
 
-#ifdef USE_V4L
+#if QT_CONFIG(linux_v4l)
     CameraBinV4LImageProcessing *m_v4lImageControl;
 #endif
 };
-- 
cgit v1.2.3