Mercurial Repositories > eric / file diff

--- a/QScintilla/Shell.py	Sat May 06 13:44:26 2017 +0200
+++ b/QScintilla/Shell.py	Sat Jun 03 13:08:50 2017 +0200
@@ -12,7 +12,7 @@
 import sys
 import re
 
-from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent, qVersion
+from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent
 from PyQt5.QtGui import QClipboard, QPalette, QFont
 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \
     QWidget, QHBoxLayout, QVBoxLayout, QShortcut
@@ -24,8 +24,8 @@
 from .QsciScintillaCompat import QsciScintillaCompat
 
 import Preferences
-
 import Utilities
+from Globals import qVersionTuple
 
 import UI.PixmapCache
 
@@ -1000,7 +1000,7 @@
         @param evt reference to the wheel event (QWheelEvent)
         """
         if evt.modifiers() & Qt.ControlModifier:
-            if qVersion() >= "5.0.0":
+            if qVersionTuple() >= (5, 0, 0):
                 delta = evt.angleDelta().y()
             else:
                 delta = evt.delta()