diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-03-06 13:56:01 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-03-07 08:21:22 +0000 |
| commit | dc6c8d5c9fe61ba58d065564f4d6dc0571475004 (patch) | |
| tree | 44b1edbea4ace619298b574f04b7ec993b00d8e4 /src/core/profile_io_data_qt.cpp | |
| parent | a64565af1e2d83665b8a0ece77750ac50555423a (diff) | |
Fix -no-ssl buildv5.13.0-beta1
Change-Id: I978f70545484060218f5243c74978c85bc603c16
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/profile_io_data_qt.cpp')
| -rw-r--r-- | src/core/profile_io_data_qt.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index f1fe96f81..a73a7c21d 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -169,7 +169,9 @@ static net::HttpNetworkSession::Params generateNetworkSessionParams(bool ignoreC ProfileIODataQt::ProfileIODataQt(ProfileQt *profile) : m_profile(profile), +#if QT_CONFIG(ssl) m_clientCertificateStoreData(new ClientCertificateStoreData), +#endif m_mutex(QMutex::Recursive), m_weakPtrFactory(this) { @@ -209,8 +211,10 @@ QPointer<ProfileAdapter> ProfileIODataQt::profileAdapter() void ProfileIODataQt::shutdownOnUIThread() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +#if QT_CONFIG(ssl) delete m_clientCertificateStoreData; m_clientCertificateStoreData = nullptr; +#endif bool posted = content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, this); if (!posted) { qWarning() << "Could not delete ProfileIODataQt on io thread !"; @@ -775,14 +779,20 @@ void ProfileIODataQt::updateUsedForGlobalCertificateVerification() base::BindOnce(&ProfileIODataQt::setGlobalCertificateVerification, m_weakPtr)); } +#if QT_CONFIG(ssl) ClientCertificateStoreData *ProfileIODataQt::clientCertificateStoreData() { return m_clientCertificateStoreData; } +#endif std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore() { +#if QT_CONFIG(ssl) return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(m_clientCertificateStoreData)); +#else + return nullptr; +#endif } // static |