Fixed code to deal with another bug in Qt installer. 6_1_x

Sat, 19 Mar 2016 15:27:52 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Mar 2016 15:27:52 +0100
branch
6_1_x
changeset 4874
8dbca5b1f89c
parent 4872
8f88c4bd5281
child 4877
2ef641412a63

Fixed code to deal with another bug in Qt installer.
(grafted from d93871657c5df850f80ab5c16dce2028eab2be5f)

Helpviewer/HelpDocsInstaller.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/HelpDocsInstaller.py	Sat Mar 19 14:39:33 2016 +0100
+++ b/Helpviewer/HelpDocsInstaller.py	Sat Mar 19 15:27:52 2016 +0100
@@ -128,7 +128,8 @@
                 QDir.separator() + "qch")
         elif version == 5:
             docsPath = QLibraryInfo.location(QLibraryInfo.DocumentationPath)
-            if not os.path.isdir(docsPath):
+            if not os.path.isdir(docsPath) or \
+                    len(QDir(docsPath).entryList(["*.qch"])) == 0:
                 # Qt installer is a bit buggy; it's missing a symbolic link
                 docsPathList = QDir.fromNativeSeparators(docsPath).split("/")
                 docsPath = os.sep.join(

eric ide

mercurial