diff options
author | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-08-31 03:10:34 -0700 |
---|---|---|
committer | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-11-17 19:14:14 -0800 |
commit | ad3ee5c52bd26cfb123d0bc47c18d4a4d2fbb64d (patch) | |
tree | 9144ac6918014541f2620343ac8d104c38ac599b /src/yuzu/configuration/configure_input_advanced.cpp | |
parent | 405d685101e60e3b9f156250f2d462f7e7217a10 (diff) |
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
Diffstat (limited to 'src/yuzu/configuration/configure_input_advanced.cpp')
-rw-r--r-- | src/yuzu/configuration/configure_input_advanced.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp index 10f841b98e..235b813d97 100644 --- a/src/yuzu/configuration/configure_input_advanced.cpp +++ b/src/yuzu/configuration/configure_input_advanced.cpp @@ -194,4 +194,8 @@ void ConfigureInputAdvanced::UpdateUIEnabled() { ui->mouse_panning->setEnabled(!ui->mouse_enabled->isChecked()); ui->mouse_panning_sensitivity->setEnabled(!ui->mouse_enabled->isChecked()); ui->ring_controller_configure->setEnabled(ui->enable_ring_controller->isChecked()); +#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) || !defined(YUZU_USE_QT_MULTIMEDIA) + ui->enable_ir_sensor->setEnabled(false); + ui->camera_configure->setEnabled(false); +#endif } |