qupzilla: part of patchset was already applied.

This commit is contained in:
Jerome Duval
2017-04-08 13:03:31 +02:00
parent 89723c912c
commit 438484e977

View File

@@ -1,26 +1,3 @@
From 9b624cfa3d7d53bf6640c4fa50381614e60f8ae3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 5 Apr 2015 20:51:42 +1000
Subject: Turn on system certificates
diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp
index a0f55df..c31de81 100644
--- a/src/lib/network/networkmanager.cpp
+++ b/src/lib/network/networkmanager.cpp
@@ -107,7 +107,7 @@ void NetworkManager::loadSettings()
m_acceptLanguage = AcceptLanguage::generateHeader(settings.value("Language/acceptLanguage", AcceptLanguage::defaultLanguage()).toStringList());
-#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) || defined(Q_OS_OS2)
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
QString certDir = DataPaths::currentProfilePath() + "/certificates";
QString bundlePath = certDir + "/ca-bundle.crt";
QString bundleVersionPath = certDir + "/bundle_version";
--
2.10.2
From 10f89aae0669c723caea8d06f14e98aff338b9cc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 16 Feb 2017 22:17:01 +0100