Bix/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-10-16 09:48:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt6: Disable IR Sensor when compiling with Qt6

Browse source 
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
This commit is contained in:
Kyle Kienapfel 2022-08-31 03:10:34 -07:00
parent ca033e8d94
commit 6269560358
6 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/yuzu/configuration/configure_camera.h
View file

@ -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;