From 05befbb49ce846da2c9013b4439945c112690f02 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Wed, 6 Dec 2023 20:14:41 +0100 Subject: [PATCH] Updates (#1664) * Deploy Wayland shells * Correct typos * Update qmdnsengine --- assets/webconfig/i18n/en.json | 4 ++-- cmake/Dependencies.cmake | 2 +- dependencies/external/qmdnsengine | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index 4e8742a9..e8e5740a 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -193,9 +193,9 @@ "conf_network_tok_lastuse": "Last use", "conf_network_tok_title": "Token Management", "conf_cec_events_heading_title": "CEC Events", - "conf_cec_events_intro": "Settings related to diffent CEC (Consumer Electronics Control) protocol events Hyperion can handle", + "conf_cec_events_intro": "Settings related to different CEC (Consumer Electronics Control) protocol events Hyperion can handle", "conf_os_events_heading_title": "Operating System Events", - "conf_os_events_intro": "Settings related to diffent Operating System events Hyperion can handle", + "conf_os_events_intro": "Settings related to different Operating System events Hyperion can handle", "conf_sched_events_heading_title": "Scheduled Events", "conf_sched_events_intro": "Settings related to scheduled, i.e. time based events, which Hyperion will handle", "conf_webconfig_label_intro": "Webconfiguration settings. Edit wisely.", diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 4715bb61..caf5663d 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -230,7 +230,7 @@ macro(DeployLinux TARGET) # Copy Qt plugins to 'share/hyperion/lib' if (QT_PLUGINS_DIR) - foreach(PLUGIN "platforms" "sqldrivers" "imageformats" "tls") + foreach(PLUGIN "platforms" "sqldrivers" "imageformats" "tls" "wayland-shell-integration") if (EXISTS ${QT_PLUGINS_DIR}/${PLUGIN}) file(GLOB files "${QT_PLUGINS_DIR}/${PLUGIN}/*.so") foreach(file ${files}) diff --git a/dependencies/external/qmdnsengine b/dependencies/external/qmdnsengine index 0ca80117..4e54bc86 160000 --- a/dependencies/external/qmdnsengine +++ b/dependencies/external/qmdnsengine @@ -1 +1 @@ -Subproject commit 0ca80117e853671d909b3cec9e2bdcac85a13b9f +Subproject commit 4e54bc86c8ed2d4fa2e7449d4ba6a6a2742d9eb1