Mercurial Repositories > eric / file diff

--- a/src/eric7/DocumentationTools/QtHelpGenerator.py	Sat Nov 26 12:30:14 2022 +0100
+++ b/src/eric7/DocumentationTools/QtHelpGenerator.py	Sat Nov 26 15:54:32 2022 +0100
@@ -13,6 +13,7 @@
 import subprocess  # secok
 import sys
 
+from eric7 import Preferences
 from eric7.Utilities import generateQtToolName, getQtBinariesPath, html_encode, joinext
 
 HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?>
@@ -284,13 +285,16 @@
 
         cwd = os.getcwd()
         # generate the compressed files
-        qhelpgeneratorExe = os.path.join(
-            getQtBinariesPath(libexec=True), generateQtToolName("qhelpgenerator")
-        )
-        if not os.path.exists(qhelpgeneratorExe):
+        qhelpgeneratorExe = Preferences.getQt("QHelpGenerator")
+        if not qhelpgeneratorExe:
             qhelpgeneratorExe = os.path.join(
-                getQtBinariesPath(libexec=False), generateQtToolName("qhelpgenerator")
+                getQtBinariesPath(libexec=True), generateQtToolName("qhelpgenerator")
             )
+            if not os.path.exists(qhelpgeneratorExe):
+                qhelpgeneratorExe = os.path.join(
+                    getQtBinariesPath(libexec=False),
+                    generateQtToolName("qhelpgenerator"),
+                )
         shutil.copy(os.path.join(self.outputDir, HelpProjectFile), self.htmlDir)
         os.chdir(self.htmlDir)
         subprocess.run(  # secok