From 37f6e522a549ae742cfb42518dd5f2549934f8fb Mon Sep 17 00:00:00 2001 From: Awawa <69086569+awawa-dev@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:59:17 +0100 Subject: [PATCH] Fix QT version check (#1009) --- sources/led-drivers/net/ProviderUdpSSL.cpp | 6 ++++-- sources/webserver/WebServer.cpp | 6 ++++-- www/js/index.js | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sources/led-drivers/net/ProviderUdpSSL.cpp b/sources/led-drivers/net/ProviderUdpSSL.cpp index d994653e4..9801c28be 100644 --- a/sources/led-drivers/net/ProviderUdpSSL.cpp +++ b/sources/led-drivers/net/ProviderUdpSSL.cpp @@ -48,8 +48,10 @@ #include #ifdef USE_STATIC_QT_PLUGINS - #include - Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin) + #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + #include + Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin) + #endif #endif ProviderUdpSSL::ProviderUdpSSL(const QJsonObject& deviceConfig) diff --git a/sources/webserver/WebServer.cpp b/sources/webserver/WebServer.cpp index 343ea2032..6fe2e6ff2 100644 --- a/sources/webserver/WebServer.cpp +++ b/sources/webserver/WebServer.cpp @@ -15,8 +15,10 @@ #include "QtHttpServer.h" #ifdef USE_STATIC_QT_PLUGINS - #include - Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin) + #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + #include + Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin) + #endif #endif // bonjour diff --git a/www/js/index.js b/www/js/index.js index d8564ffd4..d8b0dce50 100644 --- a/www/js/index.js +++ b/www/js/index.js @@ -64,7 +64,8 @@ $(document).ready(function () { instNameInit = true; } - if (window.suppressMissingLutWarningPerSession !== true && + // disable for now + if (false && window.suppressMissingLutWarningPerSession !== true && window.serverInfo.hasOwnProperty('grabbers') && window.serverInfo.grabbers.hasOwnProperty('active') && window.serverInfo.grabbers.active.length > 0 && !(window.serverInfo.grabbers.lut_for_hdr_exists === 1) &&