diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-29 11:33:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-06 06:52:06 +0000 |
| commit | a149659c5c028d4049c60c4f9a30b481a79cfe08 (patch) | |
| tree | ef9147ef0de9a6cc4bb7f9683726ebd7c3473c0b /src/network/ssl/ssl.pri | |
| parent | 514972544a34aca0fd679b3a78521a0a1558d4e0 (diff) | |
Provide access to QSslCertificate on OpenSSL free Windows builds
The QSslCertificate class can parse and provide details about SSL
certificates without a proper backend, this can for instance be used
by QtWebEngine to provide metadata about certificates, even on Windows
builds without OpenSSL, as QtWebEngine does not use Qt's SSL stack.
Change-Id: Ib48f1ed7315c5bc66721ec87ee651d8372f07f71
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/ssl.pri')
| -rw-r--r-- | src/network/ssl/ssl.pri | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 8919ec3819..6975264038 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -1,11 +1,22 @@ # OpenSSL support; compile in QSslSocket. + +HEADERS += ssl/qasn1element_p.h \ + ssl/qssl.h \ + ssl/qssl_p.h \ + ssl/qsslcertificate.h \ + ssl/qsslcertificate_p.h \ + ssl/qsslcertificateextension.h \ + ssl/qsslcertificateextension_p.h + +SOURCES += ssl/qasn1element.cpp \ + ssl/qssl.cpp \ + ssl/qsslcertificate.cpp \ + ssl/qsslcertificateextension.cpp + +!qtConfig(openssl): SOURCES += ssl/qsslcertificate_qt.cpp + qtConfig(ssl) { - HEADERS += ssl/qasn1element_p.h \ - ssl/qssl.h \ - ssl/qssl_p.h \ - ssl/qsslcertificate.h \ - ssl/qsslcertificate_p.h \ - ssl/qsslconfiguration.h \ + HEADERS += ssl/qsslconfiguration.h \ ssl/qsslconfiguration_p.h \ ssl/qsslcipher.h \ ssl/qsslcipher_p.h \ @@ -18,26 +29,19 @@ qtConfig(ssl) { ssl/qsslsocket.h \ ssl/qsslsocket_p.h \ ssl/qsslpresharedkeyauthenticator.h \ - ssl/qsslpresharedkeyauthenticator_p.h \ - ssl/qsslcertificateextension.h \ - ssl/qsslcertificateextension_p.h - SOURCES += ssl/qasn1element.cpp \ - ssl/qssl.cpp \ - ssl/qsslcertificate.cpp \ - ssl/qsslconfiguration.cpp \ + ssl/qsslpresharedkeyauthenticator_p.h + SOURCES += ssl/qsslconfiguration.cpp \ ssl/qsslcipher.cpp \ ssl/qssldiffiehellmanparameters.cpp \ ssl/qsslellipticcurve.cpp \ ssl/qsslkey_p.cpp \ ssl/qsslerror.cpp \ ssl/qsslsocket.cpp \ - ssl/qsslpresharedkeyauthenticator.cpp \ - ssl/qsslcertificateextension.cpp + ssl/qsslpresharedkeyauthenticator.cpp winrt { HEADERS += ssl/qsslsocket_winrt_p.h - SOURCES += ssl/qsslcertificate_qt.cpp \ - ssl/qsslcertificate_winrt.cpp \ + SOURCES += ssl/qsslcertificate_winrt.cpp \ ssl/qssldiffiehellmanparameters_dummy.cpp \ ssl/qsslkey_qt.cpp \ ssl/qsslkey_winrt.cpp \ @@ -47,8 +51,7 @@ qtConfig(ssl) { qtConfig(securetransport) { HEADERS += ssl/qsslsocket_mac_p.h - SOURCES += ssl/qsslcertificate_qt.cpp \ - ssl/qssldiffiehellmanparameters_dummy.cpp \ + SOURCES += ssl/qssldiffiehellmanparameters_dummy.cpp \ ssl/qsslkey_qt.cpp \ ssl/qsslkey_mac.cpp \ ssl/qsslsocket_mac_shared.cpp \ |