From 77f45e2761453237edf2e9884001f9b9f0a9c48f Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 5 Mar 2013 18:57:04 +0100 Subject: [PATCH] OS/2 Haiku: Use own certificates from CaBundle. Only on Linux and Mac OS X it is safe to use system SSL certificates. See #786 --- src/lib/network/networkmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 4afe4e8e9..bd7db43b7 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -100,7 +100,7 @@ void NetworkManager::loadSettings() settings.endGroup(); m_acceptLanguage = AcceptLanguage::generateHeader(settings.value("Language/acceptLanguage", AcceptLanguage::defaultLanguage()).toStringList()); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) || defined(Q_OS_OS2) // From doc: // QSslSocket::VerifyNone ... The connection will still be encrypted, and your socket // will still send its local certificate to the peer if it's requested. @@ -665,7 +665,7 @@ void NetworkManager::loadCertificates() QSslSocket::setDefaultCaCertificates(m_caCerts + m_localCerts); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) || defined(Q_OS_OS2) new CaBundleUpdater(this, this); #endif }