Mercurial Repositories > eric / file diff

diff -r aa752e6e9eba -r 778ccdf3417e WebBrowser/Network/NetworkManager.py
--- a/WebBrowser/Network/NetworkManager.py	Thu Mar 10 18:50:38 2016 +0100
+++ b/WebBrowser/Network/NetworkManager.py	Thu Mar 10 18:57:46 2016 +0100
@@ -25,7 +25,8 @@
     SSL_AVAILABLE = False
 
 from WebBrowser.WebBrowserWindow import WebBrowserWindow
-from .NetworkUrlInterceptor import NetworkUrlInterceptor
+# TODO: Qt 5.6
+##from .NetworkUrlInterceptor import NetworkUrlInterceptor
 
 from Utilities.AutoSaver import AutoSaver
 import Preferences
@@ -47,7 +48,7 @@
         """
         super(NetworkManager, self).__init__(parent)
         
-        if not WebBrowserWindow.mainWindow().fromEric():
+        if not WebBrowserWindow._fromEric:
             from PyQt5.QtNetwork import QNetworkProxyFactory
             from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
             
@@ -75,8 +76,9 @@
         
         # TODO: install network scheme handlers
         
-        self.__interceptor = NetworkUrlInterceptor(self)
-        WebBrowserWindow.webProfile().setRequestInterceptor(self.__interceptor)
+        # TODO: Qt 5.6
+##        self.__interceptor = NetworkUrlInterceptor(self)
+##        WebBrowserWindow.webProfile().setRequestInterceptor(self.__interceptor)
         
         # TODO: Cookie: create cookie jar
     
@@ -276,7 +278,8 @@
         @param interceptor URL interceptor to be installed
         @type UrlInterceptor
         """
-        self.__interceptor.installUrlInterceptor(interceptor)
+        # TODO: Qt 5.6
+##        self.__interceptor.installUrlInterceptor(interceptor)
     
     def removeUrlInterceptor(self, interceptor):
         """
@@ -285,10 +288,12 @@
         @param interceptor URL interceptor to be removed
         @type UrlInterceptor
         """
-        self.__interceptor.removeUrlInterceptor(interceptor)
+        # TODO: Qt 5.6
+##        self.__interceptor.removeUrlInterceptor(interceptor)
     
     def preferencesChanged(self):
         """
         Public slot to handle a change of preferences.
         """
-        self.__interceptor.preferencesChanged()
+        # TODO: Qt 5.6
+##        self.__interceptor.preferencesChanged()