Mercurial Repositories > eric / file diff

diff -r 9a71bd9e2e37 -r 6422afc7adc4 WebBrowser/Network/NetworkManager.py
--- a/WebBrowser/Network/NetworkManager.py	Sun Apr 09 16:52:55 2017 +0200
+++ b/WebBrowser/Network/NetworkManager.py	Sat May 06 13:43:21 2017 +0200
@@ -14,7 +14,7 @@
 from PyQt5.QtCore import pyqtSignal, QByteArray
 from PyQt5.QtWidgets import qApp, QStyle, QDialog
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkProxy, \
-    QNetworkRequest
+    QNetworkProxyFactory, QNetworkRequest
 from PyQt5.QtWebEngineWidgets import QWebEnginePage
 
 from E5Gui import E5MessageBox
@@ -52,12 +52,14 @@
         super(NetworkManager, self).__init__(parent)
         
         if not WebBrowserWindow._fromEric:
-            from PyQt5.QtNetwork import QNetworkProxyFactory
             from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
             
             self.__proxyFactory = E5NetworkProxyFactory()
             QNetworkProxyFactory.setApplicationProxyFactory(
                 self.__proxyFactory)
+            
+            QNetworkProxyFactory.setUseSystemConfiguration(
+                Preferences.getUI("UseSystemProxy"))
         
         self.languagesChanged()
         
@@ -334,6 +336,10 @@
         Public slot to handle a change of preferences.
         """
         self.__interceptor.preferencesChanged()
+            
+        if not WebBrowserWindow._fromEric:
+            QNetworkProxyFactory.setUseSystemConfiguration(
+                Preferences.getUI("UseSystemProxy"))
     
     def createRequest(self, op, request, data):
         """