--- a/eric7/QScintilla/MiniEditor.py Sun May 16 11:43:59 2021 +0200 +++ b/eric7/QScintilla/MiniEditor.py Sun May 16 20:07:24 2021 +0200 @@ -13,17 +13,17 @@ import editorconfig -from PyQt5.QtCore import ( +from PyQt6.QtCore import ( pyqtSignal, Qt, QSignalMapper, QPoint, QTimer, QFileInfo, QSize, QCoreApplication ) -from PyQt5.QtGui import QKeySequence, QPalette, QFont, QPixmap -from PyQt5.QtWidgets import ( - QWidget, QWhatsThis, QActionGroup, QDialog, QInputDialog, QApplication, +from PyQt6.QtGui import QKeySequence, QPalette, QFont, QPixmap, QActionGroup +from PyQt6.QtWidgets import ( + QWidget, QWhatsThis, QDialog, QInputDialog, QApplication, QMenu, QVBoxLayout, QHBoxLayout, QLabel ) -from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog -from PyQt5.Qsci import QsciScintilla +from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog +from PyQt6.Qsci import QsciScintilla from E5Gui.E5Action import E5Action, createActionGroup from E5Gui import E5MessageBox, E5FileDialog @@ -3077,7 +3077,7 @@ """ Private 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) @@ -3403,7 +3403,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():