Mercurial Repositories > eric / file diff

--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Mon Oct 01 19:55:49 2012 +0200
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Tue Oct 02 19:53:31 2012 +0200
@@ -8,7 +8,7 @@
 """
 
 
-from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer
+from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer, qVersion
 from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout
 from PyQt4.QtNetwork import QNetworkRequest
 from PyQt4.QtWebKit import QWebHitTestResult, QWebElement, QWebView, QWebElementCollection
@@ -215,7 +215,12 @@
         if checkString == "":
             checkString = element.attribute("value")
         
-        checkString = view.url().resolved(QUrl(checkString)).toString(QUrl.RemoveQuery)
+        if qVersion() >= "5.0.0":
+            checkString = view.url().resolved(QUrl(checkString)).toString(
+                QUrl.ComponentFormattingOptions(QUrl.RemoveQuery))
+        else:
+            checkString = view.url().resolved(QUrl(checkString)).toString(
+                QUrl.RemoveQuery)
         return self.__url.toEncoded().contains(QByteArray(checkString.encode("utf-8")))
     
     def __checkElement(self, element):