From ad3ee5c52bd26cfb123d0bc47c18d4a4d2fbb64d Mon Sep 17 00:00:00 2001
From: Kyle Kienapfel <Docteh@users.noreply.github.com>
Date: Wed, 31 Aug 2022 03:10:34 -0700
Subject: Qt6: Disable IR Sensor when compiling with Qt6

Gating the IR Sensor code behind a macro like so
`#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA`

The YUZU_USE_QT_MULTIMEDIA flag is implemented in later commit

Also the locale fix in src/yuzu/main.cpp is now gated against Qt6,
as it causes compilation error
---
 src/yuzu/configuration/configure_camera.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/yuzu/configuration/configure_camera.h')

diff --git a/src/yuzu/configuration/configure_camera.h b/src/yuzu/configuration/configure_camera.h
index db9833b5c..9a90512b3 100644
--- a/src/yuzu/configuration/configure_camera.h
+++ b/src/yuzu/configuration/configure_camera.h
@@ -46,8 +46,10 @@ private:
 
     bool is_virtual_camera;
     int pending_snapshots;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
     std::unique_ptr<QCamera> camera;
     std::unique_ptr<QCameraImageCapture> camera_capture;
+#endif
     std::unique_ptr<QTimer> camera_timer;
     std::vector<std::string> input_devices;
     std::unique_ptr<Ui::ConfigureCamera> ui;
-- 
cgit v1.2.3