Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/PluginEricdoc.py	Fri Jun 17 16:36:14 2022 +0200
+++ b/eric7/Plugins/PluginEricdoc.py	Fri Jun 17 17:34:46 2022 +0200
@@ -90,6 +90,7 @@
     })
     
     # 2. Qt Help Generator
+    # 2.1 location before 6.3 (Linux and macOS) and Windows
     exe = os.path.join(
         Utilities.getQtBinariesPath(),
         Utilities.generateQtToolName('qhelpgenerator')
@@ -107,6 +108,24 @@
         "version": "",
         "versionCleanup": (0, -1),
     })
+    # 2.2 location starting with 6.3.0 (Linux and macOS)
+    exe = os.path.join(
+        Utilities.getQtBinariesPath(libexec=True),
+        Utilities.generateQtToolName('qhelpgenerator')
+    )
+    if Utilities.isWindowsPlatform():
+        exe += '.exe'
+    dataList.append({
+        "programEntry": True,
+        "header": QCoreApplication.translate(
+            "EricdocPlugin", "Qt Help Tools"),
+        "exe": exe,
+        "versionCommand": '-v',
+        "versionStartsWith": 'Qt',
+        "versionPosition": -1,
+        "version": "",
+        "versionCleanup": (0, -1),
+    })
     
     return dataList