Fix QT version check (#1009)

awawa-dev · Dec 5, 2024 · 37f6e52 · 37f6e52
1 parent 00b0611
commit 37f6e52
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/sources/led-drivers/net/ProviderUdpSSL.cpp b/sources/led-drivers/net/ProviderUdpSSL.cpp
@@ -48,8 +48,10 @@
 #include <led-drivers/net/ProviderUdpSSL.h>
 
 #ifdef USE_STATIC_QT_PLUGINS
-	#include <QtPlugin>
-	Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
+	#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+		#include <QtPlugin>
+		Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
+	#endif
 #endif
 
 ProviderUdpSSL::ProviderUdpSSL(const QJsonObject& deviceConfig)

diff --git a/sources/webserver/WebServer.cpp b/sources/webserver/WebServer.cpp
@@ -15,8 +15,10 @@
 #include "QtHttpServer.h"
 
 #ifdef USE_STATIC_QT_PLUGINS
-	#include <QtPlugin>
-	Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
+	#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+		#include <QtPlugin>
+		Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
+	#endif
 #endif
 
 // bonjour

diff --git 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) &&