diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-01 11:02:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-01 20:11:26 +0100 |
| commit | 8dd42e79505bfb5477fafbe12056e2dd3c7f07b9 (patch) | |
| tree | bbc0e45c2353ad1c8b88022e73430299be71b0a4 | |
| parent | 070b94ccf1d5cd55b001aee0ae9f7e93bb405cdd (diff) | |
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 <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
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 |