summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-09-29 13:07:50 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-16 19:46:45 +0000
commit04aaaefd123cabe81f6bf84e572831f6e37438fe (patch)
tree5e40c4b3ffdb11b8b3e3d7586f19c7e9934f3e6f
parent66253640bad7b64012337977e9bf6829c328203e (diff)
Replace the ssl feature with the openssl one6.5
The 'OpcUa' module supports OpenSSL, but not a generic ssl, so the respective feature should be checked. Fixes: QTBUG-117681 Change-Id: I7722d07a35b574fbe6152572c09da0ca2fb124b0 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> (cherry picked from commit dc9e4b149a9712b350d1b5431ec03f9b6950451d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3f69621df86ffaccfdd0c3f38911d07414d78ca9)
-rw-r--r--src/opcua/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt
index d5e3c65..cccb44a 100644
--- a/src/opcua/CMakeLists.txt
+++ b/src/opcua/CMakeLists.txt
@@ -84,7 +84,9 @@ qt_internal_add_module(OpcUa
## Scopes:
#####################################################################
-qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT
+qt_internal_extend_target(OpcUa
+ CONDITION
+ QT_FEATURE_gds AND QT_FEATURE_openssl AND NOT APPLE AND NOT WINRT
SOURCES
client/qopcuagdsclient.cpp client/qopcuagdsclient_p.h
x509/openssl_symbols.cpp
@@ -102,7 +104,7 @@ qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND
x509/qopcuax509utils.cpp x509/qopcuax509utils_p.h
)
-if (QT_FEATURE_gds AND QT_FEATURE_ssl)
+if (QT_FEATURE_gds AND QT_FEATURE_openssl)
qt_internal_extend_target(OpcUa
LIBRARIES WrapOpenSSL::WrapOpenSSL)
endif()