Merge branch 'dev' into 'dev'

Adding beggining of CI build See merge request suyu-emu/suyu!69
Disable compiling telemetry code by default
2024-03-08 05:02:31 +00:00 · 2024-03-08 05:00:53 +00:00 · 2024-03-08 00:40:12 +00:00 · 2024-03-08 00:23:54 +00:00
3 changed files with 3 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -30,7 +30,7 @@ set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
 CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)

-option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
+option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" OFF)

 option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")

--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@ -114,7 +114,7 @@ void LogSettings() {
        LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path));
    };

-    LOG_INFO(Config, "yuzu Configuration:");
+    LOG_INFO(Config, "suyu Configuration:");
    for (auto& [category, settings] : values.linkage.by_category) {
        for (const auto& setting : settings) {
            if (setting->Id() == values.yuzu_token.Id()) {
--- a/src/yuzu/configuration/configure.ui
+++ b/src/yuzu/configuration/configure.ui
@ -17,7 +17,7 @@
   </size>
  </property>
  <property name="windowTitle">
-   <string>yuzu Configuration</string>
+   <string>suyu Configuration</string>
  </property>
  <layout class="QVBoxLayout" name="verticalLayout">
   <item>
Author	SHA1	Message	Date
Jermz	82fc4ddacc	Merge branch 'dev' into 'dev' Adding beggining of CI build See merge request suyu-emu/suyu!69	2024-03-08 05:02:31 +00:00
cass_058	faf840f7d5	Disable compiling telemetry code by default	2024-03-08 05:00:53 +00:00
zqpvr	5db58434e5	Update settings.cpp	2024-03-08 00:40:12 +00:00
zqpvr	664e77b4d8	Update configure.ui	2024-03-08 00:23:54 +00:00