diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-16 18:34:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-04 11:20:50 +0200 |
| commit | fae023b184f6c044e85f4ca6052c306d519e2e85 (patch) | |
| tree | 0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/net/client_cert_override.cpp | |
| parent | 38a6d268b09c49878b3a9b4819771f5c74925c35 (diff) | |
Adaptations for Chromium 100
Pick-to: 6.4
Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/net/client_cert_override.cpp')
| -rw-r--r-- | src/core/net/client_cert_override.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/net/client_cert_override.cpp b/src/core/net/client_cert_override.cpp index 875918c57..f79aae482 100644 --- a/src/core/net/client_cert_override.cpp +++ b/src/core/net/client_cert_override.cpp @@ -24,11 +24,11 @@ #include "net/ssl/client_cert_store_nss.h" #endif -#if defined(OS_WIN) +#if defined(Q_OS_WIN) #include "net/ssl/client_cert_store_win.h" #endif -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include "net/ssl/client_cert_store_mac.h" #endif @@ -46,7 +46,7 @@ public: std::move(private_key_callback).Run(m_key); } -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) SecIdentityRef sec_identity_ref() const override { return nullptr; @@ -125,9 +125,9 @@ std::unique_ptr<net::ClientCertStore> ClientCertOverrideStore::createNativeStore { #if defined(USE_NSS_CERTS) return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(net::ClientCertStoreNSS::PasswordDelegateFactory())); -#elif defined(OS_WIN) +#elif defined(Q_OS_WIN) return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin()); -#elif defined(OS_MAC) +#elif BUILDFLAG(IS_MAC) return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac()); #else return nullptr; |