Mercurial Repositories > eric / file diff

--- a/Plugins/PluginEricdoc.py	Sun Jan 20 19:38:51 2019 +0100
+++ b/Plugins/PluginEricdoc.py	Mon Jan 21 19:12:29 2019 +0100
@@ -18,7 +18,6 @@
 
 from E5Gui.E5Action import E5Action
 
-from Globals import qVersionTuple
 import Utilities
 import UI.Info
 
@@ -73,7 +72,10 @@
     })
     
     # 2. Qt Help Generator
-    exe = os.path.join(Utilities.getQtBinariesPath(), 'qhelpgenerator')
+    exe = os.path.join(
+        Utilities.getQtBinariesPath(),
+        Utilities.generateQtToolName('qhelpgenerator')
+    )
     if Utilities.isWindowsPlatform():
         exe += '.exe'
     dataList.append({
@@ -88,11 +90,15 @@
         "versionCleanup": (0, -1),
     })
     
-    if qVersionTuple() < (5, 12, 0):
-        # 3. Qt Collection Generator
-        exe = os.path.join(Utilities.getQtBinariesPath(), 'qcollectiongenerator')
-        if Utilities.isWindowsPlatform():
-            exe += '.exe'
+    # 3. Qt Collection Generator
+    exe = os.path.join(
+        Utilities.getQtBinariesPath(),
+        Utilities.generateQtToolName('qcollectiongenerator')
+    )
+    if Utilities.isWindowsPlatform():
+        exe += '.exe'
+    if Utilities.isExecutable(exe):
+        # assume Qt 5.,12 if it is missing
         dataList.append({
             "programEntry": True,
             "header": QCoreApplication.translate(