Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Mon Jun 25 18:36:54 2018 +0200
+++ b/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Tue Jun 26 18:36:50 2018 +0200
@@ -16,8 +16,8 @@
 import os
 import collections
 
-from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QDate, QProcess, QTimer, \
-    QRegExp, QSize, QPoint, QFileInfo
+from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \
+    QSize, QPoint, QFileInfo
 from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QIcon, \
     QTextCursor
 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \
@@ -26,6 +26,8 @@
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
 
+from Globals import qVersionTuple
+
 from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog
 
 from .GitDiffHighlighter import GitDiffHighlighter
@@ -304,7 +306,7 @@
         """
         self.__actionsMenu = QMenu()
         self.__actionsMenu.setTearOffEnabled(True)
-        if qVersion() >= "5.1.0":
+        if qVersionTuple() >= (5, 1, 0):
             self.__actionsMenu.setToolTipsVisible(True)
         else:
             self.__actionsMenu.hovered.connect(self.__actionsMenuHovered)

--- a/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Mon Jun 25 18:36:54 2018 +0200
+++ b/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Tue Jun 26 18:36:50 2018 +0200
@@ -17,7 +17,7 @@
 import os
 import tempfile
 
-from PyQt5.QtCore import pyqtSlot, qVersion, Qt, QProcess, QTimer, QSize
+from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize
 from PyQt5.QtGui import QTextCursor, QCursor
 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \
     QTreeWidgetItem, QLineEdit, QInputDialog, QToolTip
@@ -25,6 +25,8 @@
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 
+from Globals import qVersionTuple
+
 from .Ui_GitStatusDialog import Ui_GitStatusDialog
 
 from .GitDiffHighlighter import GitDiffHighlighter
@@ -185,7 +187,7 @@
         """
         self.__actionsMenu = QMenu()
         self.__actionsMenu.setTearOffEnabled(True)
-        if qVersion() >= "5.1.0":
+        if qVersionTuple() >= (5, 1, 0):
             self.__actionsMenu.setToolTipsVisible(True)
         else:
             self.__actionsMenu.hovered.connect(self.__actionsMenuHovered)