Skip to content

Commit 37f6e52

Browse files
authored
Fix QT version check (#1009)
1 parent 00b0611 commit 37f6e52

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

sources/led-drivers/net/ProviderUdpSSL.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@
4848
#include <led-drivers/net/ProviderUdpSSL.h>
4949

5050
#ifdef USE_STATIC_QT_PLUGINS
51-
#include <QtPlugin>
52-
Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
51+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
52+
#include <QtPlugin>
53+
Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
54+
#endif
5355
#endif
5456

5557
ProviderUdpSSL::ProviderUdpSSL(const QJsonObject& deviceConfig)

sources/webserver/WebServer.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
#include "QtHttpServer.h"
1616

1717
#ifdef USE_STATIC_QT_PLUGINS
18-
#include <QtPlugin>
19-
Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
18+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
19+
#include <QtPlugin>
20+
Q_IMPORT_PLUGIN(QTlsBackendOpenSSLPlugin)
21+
#endif
2022
#endif
2123

2224
// bonjour

www/js/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ $(document).ready(function () {
6464
instNameInit = true;
6565
}
6666

67-
if (window.suppressMissingLutWarningPerSession !== true &&
67+
// disable for now
68+
if (false && window.suppressMissingLutWarningPerSession !== true &&
6869
window.serverInfo.hasOwnProperty('grabbers') && window.serverInfo.grabbers.hasOwnProperty('active') &&
6970
window.serverInfo.grabbers.active.length > 0 &&
7071
!(window.serverInfo.grabbers.lut_for_hdr_exists === 1) &&

0 commit comments

Comments
 (0)