Helpviewer/HelpUtilities.py

changeset 2087
795992a5c561
parent 1965
96f5a76e1845
child 2107
1690f30db6f3
--- a/Helpviewer/HelpUtilities.py	Mon Oct 01 19:55:49 2012 +0200
+++ b/Helpviewer/HelpUtilities.py	Tue Oct 02 19:53:31 2012 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QUrl
+from PyQt4.QtCore import QUrl, qVersion
 
 
 def getFileNameFromUrl(url):
@@ -19,8 +19,12 @@
     @param url URL (QUrl)
     @return file name (string)
     """
-    fileName = url.toString(QUrl.RemoveFragment | QUrl.RemoveQuery |
-                            QUrl.RemoveScheme | QUrl.RemovePort)
+    if qVersion() >= "5.0.0":
+        fileName = url.toString(QUrl.ComponentFormattingOptions(
+            QUrl.RemoveFragment | QUrl.RemoveQuery | QUrl.RemoveScheme | QUrl.RemovePort))
+    else:
+        fileName = url.toString(QUrl.RemoveFragment | QUrl.RemoveQuery |
+                                QUrl.RemoveScheme | QUrl.RemovePort)
     if fileName.find("/") != -1:
         pos = fileName.rfind("/")
         fileName = fileName[pos:]

eric ide

mercurial