From ad3ee5c52bd26cfb123d0bc47c18d4a4d2fbb64d Mon Sep 17 00:00:00 2001 From: Kyle Kienapfel 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/bootmanager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/yuzu/bootmanager.h') diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index c45ebf1a2..4a01481cd 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -241,8 +241,10 @@ private: bool is_virtual_camera; int pending_camera_snapshots; +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA std::unique_ptr camera; std::unique_ptr camera_capture; +#endif std::unique_ptr camera_timer; Core::System& system; -- cgit v1.2.3