From 8dd42e79505bfb5477fafbe12056e2dd3c7f07b9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 1 Nov 2019 11:02:39 +0100 Subject: PySide2: Enable a build for Qt built with -no-feature-ssl Move QSslCertificate and QSslCertificateExtension out of the SSL branch since they are always present independently of -no-feature-ssl. Change-Id: I022d0f5e73b83f7a3c4774839e856734e17d0056 Reviewed-by: Christian Tismer --- sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sources/pyside2') diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 488f79757..7ca3fbb53 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -38,6 +38,8 @@ ${QtNetwork_GEN_DIR}/qnetworkrequest_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworksession_wrapper.cpp ${QtNetwork_GEN_DIR}/qpassworddigestor_wrapper.cpp ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp +${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp +${QtNetwork_GEN_DIR}/qsslcertificateextension_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpserver_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qudpsocket_wrapper.cpp @@ -54,16 +56,14 @@ list(FIND QtNetwork_disabled_features "dtls" _dtlsDisabledIndex) list(FIND QtNetwork_disabled_features "sctp" _sctpDisabledIndex) if(_sslEnabledIndex EQUAL -1) - list(APPEND QtNetwork_DROPPED_ENTRIES QOcspResponse QSslCertificate QSslCertificateExtension - QSslCipher QSslConfiguration QSslDiffieHellmanParameters QSslError + list(APPEND QtNetwork_DROPPED_ENTRIES QOcspResponse QSslCipher + QSslConfiguration QSslDiffieHellmanParameters QSslError QSslKey QSslPreSharedKeyAuthenticator QSslSocket) message(STATUS "Qt5Network: Dropping SSL classes") else() # Problems with operator==(QSslEllipticCurve,QSslEllipticCurve) # check_qt_class(QtNetwork QSslEllipticCurve QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES) list(APPEND QtNetwork_SRC - ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp - ${QtNetwork_GEN_DIR}/qsslcertificateextension_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcipher_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslconfiguration_wrapper.cpp ${QtNetwork_GEN_DIR}/qssldiffiehellmanparameters_wrapper.cpp -- cgit v1.2.3