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/camerabinservice.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/plugins/gstreamer/camerabin/camerabinservice.cpp')

diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp
index 3fbd1a60e..f11cfea6d 100644
--- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp
@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "camerabinservice.h"
 #include "camerabinsession.h"
 #include "camerabinrecorder.h"
@@ -48,7 +49,7 @@
 #include "camerabinmetadata.h"
 #include "camerabininfocontrol.h"
 
-#ifdef HAVE_GST_PHOTOGRAPHY
+#if QT_CONFIG(gstreamer_photography)
 #include "camerabinexposure.h"
 #include "camerabinflash.h"
 #include "camerabinfocus.h"
@@ -202,7 +203,7 @@ QMediaControl *CameraBinService::requestControl(const char *name)
     if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0)
         return m_imageCaptureControl;
 
-#ifdef HAVE_GST_PHOTOGRAPHY
+#if QT_CONFIG(gstreamer_photography)
     if (qstrcmp(name, QCameraExposureControl_iid) == 0)
         return m_captureSession->cameraExposureControl();
 
-- 
cgit v1.2.3


From 0999794030eb61c469f183f7ceb5d51ce579c42e Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 2 Mar 2017 11:58:53 +0100
Subject: Drop unused QProcess include

Change-Id: I2edc0a1a41d63a456ef2e87bdd1d0872dff0aee1
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
 src/plugins/gstreamer/camerabin/camerabinservice.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/plugins/gstreamer/camerabin/camerabinservice.cpp')

diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp
index f11cfea6d..a68ecfdbe 100644
--- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp
@@ -77,7 +77,6 @@
 #include <private/qmediaserviceprovider_p.h>
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qprocess.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3