Mercurial Repositories > eric / file diff

--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Mon Oct 01 19:55:49 2012 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py	Tue Oct 02 19:53:31 2012 +0200
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSignal, QObject, QTimer, QFile, QDir, QSettings, QUrl, \
-    QByteArray
+    QByteArray, qVersion
 from PyQt4.QtNetwork import QNetworkAccessManager
 
 from .GreaseMonkeyJavaScript import bootstrap_js
@@ -298,7 +298,11 @@
         """
         if op == QNetworkAccessManager.GetOperation and \
            request.rawHeader("X-Eric5-UserLoadAction") == QByteArray("1"):
-            urlString = request.url().toString(QUrl.RemoveFragment | QUrl.RemoveQuery)
+            if qVersion() >= "5.0.0":
+                urlString = request.url().toString(QUrl.ComponentFormattingOptions(
+                    QUrl.RemoveFragment | QUrl.RemoveQuery))
+            else:
+                urlString = request.url().toString(QUrl.RemoveFragment | QUrl.RemoveQuery)
             if urlString.endswith(".user.js"):
                 self.downloadScript(request)
                 return EmptyNetworkReply(self)