From 5fce82bc6cb1e118fb26cf9b61f2c07c007ec8b9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 9 Jun 2022 17:17:58 +0200 Subject: [PATCH] Move ssl header files to the general QtNetwork sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move public ssl headers to the general QtNetwork sources since they supposed to be used across the project without corresponding checks for the FEATURE_ssl presence. The content in these header files has a conditional implementation guarded by corresponding macros. Change-Id: I43168469da27321c2d8064ec2e5d7fe31126ebec Reviewed-by: Mårten Nordheim Reviewed-by: Alexandru Croitor --- src/network/CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 98fcb5d1669..71a79f6fe89 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -45,6 +45,11 @@ qt_internal_add_module(Network ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h + ssl/qsslcipher.h + ssl/qsslconfiguration.h + ssl/qsslerror.h + ssl/qsslkey.h + ssl/qsslsocket.h ssl/qtlsbackend.cpp ssl/qtlsbackend_p.h DEFINES QT_NO_FOREACH @@ -322,14 +327,14 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl SOURCES ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h - ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h - ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h + ssl/qsslcipher.cpp ssl/qsslcipher_p.h + ssl/qsslconfiguration.cpp ssl/qsslconfiguration_p.h ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h ssl/qsslellipticcurve.cpp ssl/qsslellipticcurve.h - ssl/qsslerror.cpp ssl/qsslerror.h - ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h + ssl/qsslerror.cpp + ssl/qsslkey_p.cpp ssl/qsslkey_p.h ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h - ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h + ssl/qsslsocket.cpp ssl/qsslsocket_p.h ssl/qsslserver.cpp ssl/qsslserver.h ssl/qsslserver_p.h )