Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Tue Mar 29 10:32:22 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Tue Mar 29 16:34:32 2016 +0200
@@ -140,6 +140,8 @@
         self.__eventKeyboardModifiers = Qt.NoModifier
         
         if self.__initShortcutsOnly:
+            WebBrowserWindow.setUseQtHelp(
+                self.__fromEric or qthelp or bool(searchWord))
             self.__initActions()
         else:
             if Preferences.getWebBrowser("WebInspectorEnabled"):
@@ -169,10 +171,9 @@
                 self.setStyle(Preferences.getUI("Style"),
                               Preferences.getUI("StyleSheet"))
                 
-                # TODO: Check if this is needed with QtWebEngine
                 # initialize some SSL stuff
-##                from E5Network.E5SslUtilities import initSSL
-##                initSSL()
+                from E5Network.E5SslUtilities import initSSL
+                initSSL()
             
             if WebBrowserWindow.useQtHelp:
                 self.__helpEngine = QHelpEngine(