Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py

changeset 2107
1690f30db6f3
parent 2087
795992a5c561
child 2302
f29e9405c851
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Oct 06 14:50:12 2012 +0200
+++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py	Sat Oct 06 17:58:06 2012 +0200
@@ -8,7 +8,7 @@
 """
 
 
-from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer, qVersion
+from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray,  QTimer
 from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout
 from PyQt4.QtNetwork import QNetworkRequest
 from PyQt4.QtWebKit import QWebHitTestResult, QWebElement, QWebView, QWebElementCollection
@@ -215,12 +215,8 @@
         if checkString == "":
             checkString = element.attribute("value")
         
-        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)
+        checkString = view.url().resolved(QUrl(checkString)).toString(
+            QUrl.RemoveQuery)
         return self.__url.toEncoded().contains(QByteArray(checkString.encode("utf-8")))
     
     def __checkElement(self, element):

eric ide

mercurial