Mercurial Repositories > eric / file diff

diff -r 643ec3a53d17 -r bddd12f27a4c Preferences/ConfigurationPages/HelpViewersPage.py
--- a/Preferences/ConfigurationPages/HelpViewersPage.py	Fri Dec 14 19:52:38 2018 +0100
+++ b/Preferences/ConfigurationPages/HelpViewersPage.py	Sat Dec 15 16:21:38 2018 +0100
@@ -16,15 +16,7 @@
 except ImportError:
     WEBKIT_AVAILABLE = False
 
-from Globals import qVersionTuple
-if qVersionTuple() < (5, 6, 0):
-    WEBENGINE_AVAILABLE = False
-else:
-    try:
-        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
-        WEBENGINE_AVAILABLE = True
-    except ImportError:
-        WEBENGINE_AVAILABLE = False
+from Globals import getWebBrowserSupport
 
 from E5Gui.E5PathPicker import E5PathPickerModes
 
@@ -55,14 +47,13 @@
         self.helpViewerGroup.addButton(self.customViewerButton)
         
         # set initial values
-        if WEBENGINE_AVAILABLE:
+        webBrowserVariant = getWebBrowserSupport()
+        if webBrowserVariant == "QtWebEngine":
             hvId = Preferences.getWebBrowser("HelpViewerType")
-        else:
+        elif webBrowserVariant == "QtWebKit":
             hvId = Preferences.getHelp("HelpViewerType")
-        if not WEBENGINE_AVAILABLE and not WEBKIT_AVAILABLE:
-            if hvId == 1:
-                hvId = Preferences.Prefs.webBrowserDefaultsDefaults[
-                    "HelpViewerType"]
+        else:
+            hvId = 3
             self.helpBrowserButton.setEnabled(False)
         
         if hvId == 1: