Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/Editor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Sun May 16 20:07:24 2021 +0200
@@ -14,16 +14,16 @@
 
 import editorconfig
 
-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QDir, QTimer, QModelIndex, QFileInfo,
     QCryptographicHash, QEvent, QDateTime, QPoint
 )
-from PyQt5.QtGui import QPalette, QFont, QPixmap, QPainter
-from PyQt5.QtWidgets import (
-    QLineEdit, QActionGroup, QDialog, QInputDialog, QApplication, QMenu
+from PyQt6.QtGui import QPalette, QFont, QPixmap, QPainter, QActionGroup
+from PyQt6.QtWidgets import (
+    QLineEdit, QDialog, QInputDialog, QApplication, QMenu
 )
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
-from PyQt5.Qsci import QsciScintilla, QsciMacro, QsciStyledText
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
+from PyQt6.Qsci import QsciScintilla, QsciMacro, QsciStyledText
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -1811,7 +1811,7 @@
         )
         fdesc = Preferences.Prefs.settings.value(key)
         if fdesc is not None:
-            font = QFont(fdesc[0], int(fdesc[1]))
+            font = QFont([fdesc[0]], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
         if self.lexer_.hasSubstyles():
@@ -2740,7 +2740,7 @@
         """
         Public slot to show a print preview of the text.
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog
         from .Printer import Printer
         
         printer = Printer(mode=QPrinter.PrinterMode.HighResolution)
@@ -7161,7 +7161,7 @@
         """
         super().mouseDoubleClickEvent(evt)
         
-        self.mouseDoubleClick.emit(evt.pos(), evt.buttons())
+        self.mouseDoubleClick.emit(evt.position().toPoint(), evt.buttons())
         
     def wheelEvent(self, evt):
         """