Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Mon Dec 31 12:35:13 2012 +0100
+++ b/Preferences/__init__.py	Mon Dec 31 15:01:06 2012 +0100
@@ -643,6 +643,7 @@
         "Python2DocDir": "",
         "QtDocDir": "",
         "Qt4DocDir": "",
+        "Qt5DocDir": "",
         "PyQt4DocDir": "",
         "PySideDocDir": "",
         "SingleHelpWindow": True,
@@ -2082,7 +2083,23 @@
     if s == "":
         s = os.getenv("QT4DOCDIR", "")
     if s == "":
-        s = QLibraryInfo.location(QLibraryInfo.DocumentationPath)
+        s = os.path.join(QLibraryInfo.location(QLibraryInfo.DocumentationPath), "html")
+    return s
+    
+
+def getQt5DocDir(prefClass=Prefs):
+    """
+    Module function to retrieve the Qt5DocDir setting.
+    
+    @param prefClass preferences class used as the storage area
+    @return the requested Qt4DocDir setting (string)
+    """
+    s = prefClass.settings.value("Help/Qt5DocDir",
+        prefClass.helpDefaults["Qt5DocDir"])
+    if s == "":
+        s = os.getenv("QT5DOCDIR", "")
+    if s == "":
+        s = os.path.join(QLibraryInfo.location(QLibraryInfo.DocumentationPath), "qtdoc")
     return s