Mercurial Repositories > eric / file diff

--- a/DocumentationTools/QtHelpGenerator.py	Thu Jan 10 14:23:49 2019 +0100
+++ b/DocumentationTools/QtHelpGenerator.py	Sat Feb 02 11:12:54 2019 +0100
@@ -16,7 +16,7 @@
 import subprocess
 
 from Utilities import joinext, relpath, html_encode, getQtBinariesPath, \
-    generateQtToolName
+    generateQtToolName, isExecutable
 
 HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?>
 <QHelpCollectionProject version="1.0">
@@ -270,23 +270,30 @@
         
         cwd = os.getcwd()
         # generate the compressed files
+        qhelpgeneratorExe = os.path.join(
+            getQtBinariesPath(), generateQtToolName("qhelpgenerator")
+        )
         shutil.copy(
             os.path.join(self.outputDir, HelpProjectFile), self.htmlDir)
         os.chdir(self.htmlDir)
         subprocess.call([
-            os.path.join(getQtBinariesPath(),
-                         generateQtToolName("qhelpgenerator")),
+            qhelpgeneratorExe,
             HelpProjectFile, "-o", os.path.join(self.outputDir, HelpHelpFile)])
         os.remove(HelpProjectFile)
         
         if self.createCollection:
+            qcollectiongeneratorExe = os.path.join(
+                getQtBinariesPath(), generateQtToolName("qcollectiongenerator")
+            )
+            if not isExecutable(qcollectiongeneratorExe):
+                # assume Qt >= 5.12.0
+                qcollectiongeneratorExe = qhelpgeneratorExe
             sys.stdout.write("Generating QtHelp collection...\n")
             sys.stdout.flush()
             sys.stderr.flush()
             os.chdir(self.outputDir)
             subprocess.call([
-                os.path.join(getQtBinariesPath(),
-                             generateQtToolName("qcollectiongenerator")),
+                qcollectiongeneratorExe,
                 HelpCollectionProjectFile, "-o", HelpCollectionFile])
         
         os.chdir(cwd)