Mercurial Repositories > eric / file diff

--- a/DocumentationTools/QtHelpGenerator.py	Tue Apr 23 19:57:07 2013 +0200
+++ b/DocumentationTools/QtHelpGenerator.py	Wed Apr 24 18:16:34 2013 +0200
@@ -12,9 +12,7 @@
 import shutil
 import subprocess
 
-from PyQt4.QtCore import QLibraryInfo
-
-from Utilities import joinext, relpath, html_encode
+from Utilities import joinext, relpath, html_encode, getQtBinariesPath
 
 HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?>
 <QHelpCollectionProject version="1.0">
@@ -261,8 +259,7 @@
         # generate the compressed files
         shutil.copy(os.path.join(self.outputDir, HelpProjectFile), self.htmlDir)
         os.chdir(self.htmlDir)
-        subprocess.call([os.path.join(QLibraryInfo.location(QLibraryInfo.BinariesPath),
-                            "qhelpgenerator"),
+        subprocess.call([os.path.join(getQtBinariesPath(), "qhelpgenerator"),
                          "source.qhp", "-o", os.path.join(self.outputDir, HelpHelpFile)])
         os.remove(HelpProjectFile)
         
@@ -271,9 +268,7 @@
             sys.stdout.flush()
             sys.stderr.flush()
             os.chdir(self.outputDir)
-            subprocess.call([os.path.join(
-                                QLibraryInfo.location(QLibraryInfo.BinariesPath),
-                                "qcollectiongenerator"),
+            subprocess.call([os.path.join(getQtBinariesPath(), "qcollectiongenerator"),
                              "source.qhcp", "-o", "collection.qhc"])
         
         os.chdir(cwd)