WebBrowser/Feeds/FeedsDialog.py

branch
QtWebEngine
changeset 4913
e16573640cb8
parent 4801
71bdc520f640
child 5389
9b1c800daff3
--- a/WebBrowser/Feeds/FeedsDialog.py	Sat Apr 02 19:44:09 2016 +0200
+++ b/WebBrowser/Feeds/FeedsDialog.py	Sun Apr 03 16:22:18 2016 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtCore import QUrl, qVersion
+from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QDialog, QPushButton, QLabel
 
 from E5Gui import E5MessageBox
@@ -63,19 +63,8 @@
         url = QUrl(urlString)
         if url.isRelative():
             url = self.__browser.url().resolved(url)
-            if qVersion() >= "5.0.0":
-                urlString = url.toDisplayString(QUrl.FullyDecoded)
-            else:
-                urlString = url.toString()
-##            if not urlString.startswith("/"):
-##                urlString = "/" + urlString
-##            urlString = self.__browser.url().host() + urlString
-##            tmpUrl = QUrl(urlString)
-##            if not tmpUrl.scheme():
-##                urlString = "http://" + urlString
-##            tmpUrl = QUrl(urlString)
-##            if not tmpUrl.scheme() or not tmpUrl.host():
-##                return
+            urlString = url.toDisplayString(QUrl.FullyDecoded)
+        
         if not url.isValid():
             return
         

eric ide

mercurial