Mercurial Repositories > eric / changeset
changeset
Continued porting the web browser.
Thu, 10 Mar 2016 18:57:46 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 10 Mar 2016 18:57:46 +0100
- branch
- QtWebEngine
- changeset 4827
- 778ccdf3417e
- parent 4826
- aa752e6e9eba
- child 4831
- bf53c06fa0fb
Continued porting the web browser.
- commented out some Qt 5.6 related code because PyQt5 doesn't work yet (on my main development machine)
| WebBrowser/Network/NetworkManager.py | file | annotate | diff | comparison | revisions |
--- 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()
