Mercurial Repositories > eric / file diff

diff -r 1ff6d0ecb2fd -r c973eef8fef1 WebBrowser/Network/NetworkManager.py
--- a/WebBrowser/Network/NetworkManager.py	Sat Feb 20 15:25:51 2016 +0100
+++ b/WebBrowser/Network/NetworkManager.py	Sat Feb 20 17:31:34 2016 +0100
@@ -16,6 +16,8 @@
 
 from E5Network.E5NetworkProxyFactory import proxyAuthenticationRequired
 
+from WebBrowser.WebBrowserWindow import WebBrowserWindow
+
 import Preferences
 
 
@@ -31,6 +33,14 @@
         """
         super(NetworkManager, self).__init__(parent)
         
+        if not WebBrowserWindow.mainWindow().fromEric():
+            from PyQt5.QtNetwork import QNetworkProxyFactory
+            from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
+            
+            self.__proxyFactory = E5NetworkProxyFactory()
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+        
         self.languagesChanged()
         
         self.__ignoredSslErrors = {}