Mercurial Repositories > eric / file diff

--- a/Helpviewer/UrlBar/UrlBar.py	Sat May 13 13:46:05 2017 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py	Sat May 13 16:32:54 2017 +0200
@@ -13,7 +13,7 @@
 except NameError:
     pass
 
-from PyQt5.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, qVersion
+from PyQt5.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime
 from PyQt5.QtGui import QColor, QPalette, QLinearGradient, QIcon
 from PyQt5.QtWidgets import QDialog, QApplication
 try:
@@ -34,6 +34,7 @@
 import UI.PixmapCache
 import Preferences
 import Utilities
+from Globals import qVersionTuple
 
 
 class UrlBar(E5LineEdit):
@@ -187,14 +188,14 @@
                QSslCertificate is not None:
                 sslInfo = self.__browser.page().getSslCertificate()
                 if sslInfo is not None:
-                    if qVersion() >= "5.0.0":
+                    if qVersionTuple() >= (5, 0, 0):
                         org = Utilities.decodeString(", ".join(
                             sslInfo.subjectInfo(QSslCertificate.Organization)))
                     else:
                         org = Utilities.decodeString(
                             sslInfo.subjectInfo(QSslCertificate.Organization))
                     if org == "":
-                        if qVersion() >= "5.0.0":
+                        if qVersionTuple() >= (5, 0, 0):
                             cn = Utilities.decodeString(", ".join(
                                 sslInfo.subjectInfo(
                                     QSslCertificate.CommonName)))
@@ -208,7 +209,7 @@
                             org = self.tr("Unknown")
                     self.__sslLabel.setText(" {0} ".format(org))
                     self.__sslLabel.setVisible(True)
-                    if qVersion() >= "5.0.0":
+                    if qVersionTuple() >= (5, 0, 0):
                         valid = not sslInfo.isBlacklisted()
                     else:
                         valid = sslInfo.isValid()