From a5a87139708bf99cfc9433af0d2365e080db613e Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 22 Feb 2026 20:56:40 -0500 Subject: [PATCH] [cmake] Comment out YUZU_USE_QT_MULTIMEDIA usages This option is currently dead code. Let's not use it. In the future we should definitely update it. See: #3468 Signed-off-by: crueter --- CMakeLists.txt | 14 +++++++------- src/yuzu/CMakeLists.txt | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0a5ad9a51..1996556b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ endif() option(ENABLE_QT "Enable the Qt frontend" ON) option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF) option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF) -option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) +# option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF) set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries") cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF) @@ -643,9 +643,9 @@ if (ENABLE_QT) find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Charts Concurrent) - if (YUZU_USE_QT_MULTIMEDIA) - find_package(Qt6 REQUIRED COMPONENTS Multimedia) - endif() + # if (YUZU_USE_QT_MULTIMEDIA) + # find_package(Qt6 REQUIRED COMPONENTS Multimedia) + # endif() if (PLATFORM_LINUX OR PLATFORM_FREEBSD) # yes Qt, we get it @@ -684,9 +684,9 @@ if (ENABLE_QT) if (PLATFORM_LINUX) list(APPEND YUZU_QT_COMPONENTS DBus) endif() - if (YUZU_USE_QT_MULTIMEDIA) - list(APPEND YUZU_QT_COMPONENTS Multimedia) - endif() + # if (YUZU_USE_QT_MULTIMEDIA) + # list(APPEND YUZU_QT_COMPONENTS Multimedia) + # endif() if (YUZU_USE_QT_WEB_ENGINE) list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets) endif() diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 1fb87fe1f8..63dbf9d30b 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -416,10 +416,10 @@ if (ENABLE_WEB_SERVICE) target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE) endif() -if (YUZU_USE_QT_MULTIMEDIA) - target_link_libraries(yuzu PRIVATE Qt6::Multimedia) - target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA) -endif () +# if (YUZU_USE_QT_MULTIMEDIA) +# target_link_libraries(yuzu PRIVATE Qt6::Multimedia) +# target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA) +# endif () if (YUZU_USE_QT_WEB_ENGINE) target_link_libraries(yuzu PRIVATE Qt6::WebEngineCore Qt6::WebEngineWidgets)