diff -r f9dc65b75525 -r 8a3d75ba46dc DocumentationTools/QtHelpGenerator.py --- a/DocumentationTools/QtHelpGenerator.py Wed Mar 15 19:48:12 2017 +0100 +++ b/DocumentationTools/QtHelpGenerator.py Wed Mar 15 19:54:54 2017 +0100 @@ -15,7 +15,8 @@ import shutil import subprocess -from Utilities import joinext, relpath, html_encode, getQtBinariesPath +from Utilities import joinext, relpath, html_encode, getQtBinariesPath, \ + generateQtToolName HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?> <QHelpCollectionProject version="1.0"> @@ -273,7 +274,8 @@ os.path.join(self.outputDir, HelpProjectFile), self.htmlDir) os.chdir(self.htmlDir) subprocess.call([ - os.path.join(getQtBinariesPath(), "qhelpgenerator"), + os.path.join(getQtBinariesPath(), + generateQtToolName("qhelpgenerator")), HelpProjectFile, "-o", os.path.join(self.outputDir, HelpHelpFile)]) os.remove(HelpProjectFile) @@ -283,7 +285,8 @@ sys.stderr.flush() os.chdir(self.outputDir) subprocess.call([ - os.path.join(getQtBinariesPath(), "qcollectiongenerator"), + os.path.join(getQtBinariesPath(), + generateQtToolName("qcollectiongenerator")), HelpCollectionProjectFile, "-o", HelpCollectionFile]) os.chdir(cwd)