QScintilla/Shell.py

changeset 3656
441956d8fce5
parent 3631
2f5169646a4a
child 3693
983904b9568f
diff -r ffeb85cdc72d -r 441956d8fce5 QScintilla/Shell.py
--- a/QScintilla/Shell.py	Sun Jun 29 14:00:30 2014 +0200
+++ b/QScintilla/Shell.py	Sun Jun 29 20:13:56 2014 +0200
@@ -12,10 +12,11 @@
 import sys
 import re
 
-from PyQt4.QtCore import pyqtSignal, QFileInfo, Qt, QEvent
-from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QClipboard, \
-    QMenu, QPalette, QFont, QWidget, QHBoxLayout, QVBoxLayout, QShortcut
-from PyQt4.Qsci import QsciScintilla
+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
+from PyQt5.Qsci import QsciScintilla
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -856,7 +857,7 @@
         @param evt reference to the wheel event (QWheelEvent)
         """
         if evt.modifiers() & Qt.ControlModifier:
-            if evt.delta() < 0:
+            if evt.angleDelta().y() < 0:
                 self.zoomOut()
             else:
                 self.zoomIn()

eric ide

mercurial