diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-25 14:02:25 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-30 14:23:15 +0000 |
| commit | afdec6d4b624273494f86fa5da4815deafbe8fda (patch) | |
| tree | 6bef070678caccc61cf131130eb1ac2d38f07f70 /src/core | |
| parent | 46d68dcf726e6ba385a91cbeb5db131c0d1d0e9d (diff) | |
Fix -no-ssl build
Change-Id: I20ca768b2ca5be0992d62c4ce4a32f572169b5bd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/api/qwebengineclientcertificatestore.h | 4 | ||||
| -rw-r--r-- | src/core/qwebengineclientcertificatestore.cpp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h index 82607ea70..6ba998465 100644 --- a/src/core/api/qwebengineclientcertificatestore.h +++ b/src/core/api/qwebengineclientcertificatestore.h @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE +#if QT_CONFIG(ssl) + struct QWebEngineClientCertificateStoreData; class QWEBENGINECORE_EXPORT QWebEngineClientCertificateStore { @@ -72,6 +74,8 @@ private: QWebEngineClientCertificateStoreData *d_ptr; }; +#endif // QT_CONFIG(ssl) + QT_END_NAMESPACE #endif // QWebEngineClientCertificateStore_H diff --git a/src/core/qwebengineclientcertificatestore.cpp b/src/core/qwebengineclientcertificatestore.cpp index 173d81fc3..08f4389d7 100644 --- a/src/core/qwebengineclientcertificatestore.cpp +++ b/src/core/qwebengineclientcertificatestore.cpp @@ -71,6 +71,8 @@ QT_BEGIN_NAMESPACE +#if QT_CONFIG(ssl) + typedef struct OverrideData { QSslKey key; QSslCertificate certificate; @@ -197,6 +199,8 @@ void QWebEngineClientCertificateStore::clear() ClientCertOverrideData.clear(); } +#endif // QT_CONFIG(ssl) + QT_END_NAMESPACE namespace net { @@ -245,6 +249,7 @@ ClientCertOverrideStore::~ClientCertOverrideStore() void ClientCertOverrideStore::GetClientCerts(const SSLCertRequestInfo &cert_request_info, const ClientCertListCallback &callback) { +#if QT_CONFIG(ssl) // Look for certificates in memory store for (int i = 0; i < ClientCertOverrideData.length(); i++) { scoped_refptr<net::X509Certificate> cert = ClientCertOverrideData[i]->certPtr; @@ -255,6 +260,7 @@ void ClientCertOverrideStore::GetClientCerts(const SSLCertRequestInfo &cert_requ return; } } +#endif // QT_CONFIG(ssl) // Continue with native cert store if matching certificate is not found in memory std::unique_ptr<net::ClientCertStore> store = getNativeStore(); |