diff -r 330a43a4db79 -r 6ead5f865f72 eric6/DocumentationTools/QtHelpGenerator.py
--- a/eric6/DocumentationTools/QtHelpGenerator.py Sat Oct 03 15:23:58 2020 +0200
+++ b/eric6/DocumentationTools/QtHelpGenerator.py Sat Oct 03 15:24:48 2020 +0200
@@ -15,8 +15,7 @@
import subprocess # secok
from Utilities import (
- joinext, relpath, html_encode, getQtBinariesPath, generateQtToolName,
- isExecutable
+ joinext, relpath, html_encode, getQtBinariesPath, generateQtToolName
)
HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?>
@@ -286,18 +285,12 @@
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([ # secok
- qcollectiongeneratorExe,
+ qhelpgeneratorExe,
HelpCollectionProjectFile, "-o", HelpCollectionFile])
os.chdir(cwd)
