eric: changeset 8318:962bce857696

--- a/eric7.epj	Sun May 16 11:43:59 2021 +0200
+++ b/eric7.epj	Sun May 16 20:07:24 2021 +0200
@@ -247,20 +247,25 @@
     "EMAIL": "detlev@die-offenbachs.de",
     "EOL": 1,
     "FILETYPES": {
+      "*.epj": "OTHERS",
       "*.idl": "INTERFACES",
-      "*.js": "OTHERS",
+      "*.md": "OTHERS",
+      "*.proto": "PROTOCOLS",
       "*.py": "SOURCES",
       "*.py3": "SOURCES",
       "*.pyw": "SOURCES",
       "*.pyw3": "SOURCES",
       "*.qm": "TRANSLATIONS",
-      "*.qrc": "RESOURCES",
-      "*.rb": "SOURCES",
+      "*.rst": "OTHERS",
       "*.ts": "TRANSLATIONS",
+      "*.txt": "OTHERS",
       "*.ui": "FORMS",
-      "*.ui.h": "FORMS",
+      "GNUmakefile": "OTHERS",
+      "Makefile": "OTHERS",
+      "README": "OTHERS",
+      "README.*": "OTHERS",
       "Ui_*.py": "__IGNORE__",
-      "build": "__IGNORE__"
+      "makefile": "OTHERS"
     },
     "FORMS": [
       "eric7/CondaInterface/CondaExecDialog.ui",
@@ -926,7 +931,12 @@
       "eric7/APIs/Python3/eric7.api",
       "eric7/APIs/Python3/eric7.bas",
       "docs/eric7-plugin.odt",
-      "docs/eric7-plugin.pdf"
+      "docs/eric7-plugin.pdf",
+      "eric7/DebugClients/Python/coverage/doc/CHANGES.rst",
+      "eric7/DebugClients/Python/coverage/doc/LICENSE.txt",
+      "eric7/DebugClients/Python/coverage/doc/CONTRIBUTORS.txt",
+      "eric7/DebugClients/Python/coverage/doc/README.rst",
+      "eric7/icons/oxygen/languages/readme.txt"
     ],
     "OTHERTOOLSPARMS": {
       "CodeMetrics": {
@@ -938,7 +948,7 @@
     },
     "PACKAGERSPARMS": {},
     "PROGLANGUAGE": "Python3",
-    "PROJECTTYPE": "PyQt5",
+    "PROJECTTYPE": "PyQt6",
     "PROJECTTYPESPECIFICDATA": {},
     "PROTOCOLS": [],
     "RCCPARAMS": {
@@ -2355,4 +2365,4 @@
     "VCSOTHERDATA": {},
     "VERSION": "7.x"
   }
-}
\ No newline at end of file
+}
--- a/eric7/CondaInterface/Conda.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/Conda.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QObject, QProcess, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSignal, QObject, QProcess, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/CondaInterface/CondaExecDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaExecDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import json

-from PyQt5.QtCore import pyqtSlot, QProcess, QTimer
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton

 from E5Gui import E5MessageBox
--- a/eric7/CondaInterface/CondaExportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaExportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractButton, QApplication
 )
--- a/eric7/CondaInterface/CondaInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the conda information dialog.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_CondaInfoDialog import Ui_CondaInfoDialog
--- a/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for a new conda environment.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/CondaInterface/CondaPackageDetailsWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaPackageDetailsWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a widget and a dialog to show package details.
 """

-from PyQt5.QtCore import Qt, QDateTime
-from PyQt5.QtWidgets import QWidget, QDialog, QVBoxLayout, QDialogButtonBox
+from PyQt6.QtCore import Qt, QDateTime
+from PyQt6.QtWidgets import QWidget, QDialog, QVBoxLayout, QDialogButtonBox

 from .Ui_CondaPackageDetailsWidget import Ui_CondaPackageDetailsWidget
--- a/eric7/CondaInterface/CondaPackagesWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/CondaPackagesWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QWidget, QToolButton, QMenu, QTreeWidgetItem, QApplication, QLineEdit,
     QDialog
 )
--- a/eric7/CondaInterface/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/CondaInterface/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QCoreApplication, QProcess
+from PyQt6.QtCore import QCoreApplication, QProcess

 import Preferences
--- a/eric7/Cooperation/ChatWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the chat dialog.
 """

-from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication
+from PyQt6.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Cooperation/Connection.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Cooperation/Connection.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a class representing a peer connection.
 """

-from PyQt5.QtCore import pyqtSignal, QTimer, QTime, QByteArray
-from PyQt5.QtNetwork import QTcpSocket, QHostInfo
+from PyQt6.QtCore import pyqtSignal, QTimer, QTime, QByteArray
+from PyQt6.QtNetwork import QTcpSocket, QHostInfo

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
@@ -235,7 +235,7 @@
                 self.__sendGreetingMessage()

             self.__pingTimer.start()
-            self.__pongTime.start()
+            self.__pongTime = QTime.currentTime()
             self.__state = Connection.ReadyForUse
             self.readyForUse.emit()

@@ -255,7 +255,7 @@
         """
         Private slot to send a ping message.
         """
-        if self.__pongTime.elapsed() > PongTimeout:
+        if self.__pongTime.msecsTo(QTime.currentTime()) > PongTimeout:
             self.abort()
             return

@@ -389,7 +389,7 @@
             self.write(QByteArray("{0}{1}1{1}p".format(
                 Connection.ProtocolPong, SeparatorToken).encode("utf-8")))
         elif self.__currentDataType == Connection.Pong:
-            self.__pongTime.restart()
+            self.__pongTime = QTime.currentTime()
         elif self.__currentDataType == Connection.GetParticipants:
             self.getParticipants.emit()
         elif self.__currentDataType == Connection.Participants:
--- a/eric7/Cooperation/CooperationClient.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Cooperation/CooperationClient.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import collections

-from PyQt5.QtCore import QObject, pyqtSignal, QProcess
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import QObject, pyqtSignal, QProcess
+from PyQt6.QtNetwork import (
     QHostInfo, QHostAddress, QAbstractSocket, QNetworkInterface
 )
--- a/eric7/Cooperation/CooperationServer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Cooperation/CooperationServer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the cooperation server.
 """

-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtNetwork import QTcpServer
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtNetwork import QTcpServer

 from .Connection import Connection
--- a/eric7/DataViews/CodeMetricsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/DataViews/CodeMetricsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import fnmatch
 import collections

-from PyQt5.QtCore import pyqtSlot, Qt, QLocale
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QLocale
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem,
     QApplication
 )
@@ -89,7 +89,7 @@
         itm = QTreeWidgetItem(parent, data)
         for col in range(1, 7):
             itm.setTextAlignment(
-                col, Qt.Alignment(Qt.AlignmentFlag.AlignRight))
+                col, Qt.AlignmentFlag.AlignRight)
         return itm

     def __resizeSummaryColumns(self):
@@ -108,7 +108,7 @@
         @param col1 string for column 1 (string)
         """
         itm = QTreeWidgetItem(self.summaryList, [col0, col1])
-        itm.setTextAlignment(1, Qt.Alignment(Qt.AlignmentFlag.AlignRight))
+        itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)

     def prepare(self, fileList, project):
         """
--- a/eric7/DataViews/PyCoverageDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/DataViews/PyCoverageDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem,
     QApplication
 )
--- a/eric7/DataViews/PyProfileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/DataViews/PyProfileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import pickle       # secok

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem,
     QApplication
 )
--- a/eric7/Debugger/BreakPointModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/BreakPointModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import copy

-from PyQt5.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex
+from PyQt6.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex


 class BreakPointModel(QAbstractItemModel):
@@ -43,13 +43,13 @@
             self.tr('Enabled'),
             self.tr('Ignore Count'),
         ]
-        self.alignments = [Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
+        self.alignments = [Qt.AlignmentFlag.AlignLeft,
+                           Qt.AlignmentFlag.AlignRight,
+                           Qt.AlignmentFlag.AlignLeft,
+                           Qt.AlignmentFlag.AlignHCenter,
+                           Qt.AlignmentFlag.AlignHCenter,
+                           Qt.AlignmentFlag.AlignRight,
+                           Qt.AlignmentFlag.AlignHCenter,
                            ]

     def columnCount(self, parent=None):
--- a/eric7/Debugger/BreakPointViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/BreakPointViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the Breakpoint viewer widget.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, Qt, QItemSelectionModel, QSortFilterProxyModel, QFileInfo
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QTreeView, QAbstractItemView, QHeaderView, QMenu, QDialog
 )

@@ -145,15 +145,11 @@
             return

         flags = (
-            QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.SelectionFlag.ClearAndSelect |
-                QItemSelectionModel.SelectionFlag.Rows
-            )
+            (QItemSelectionModel.SelectionFlag.ClearAndSelect |
+             QItemSelectionModel.SelectionFlag.Rows)
             if selected else
-            QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.SelectionFlag.Deselect |
-                QItemSelectionModel.SelectionFlag.Rows
-            )
+            (QItemSelectionModel.SelectionFlag.Deselect |
+             QItemSelectionModel.SelectionFlag.Rows)
         )
         self.selectionModel().select(index, flags)
--- a/eric7/Debugger/CallStackViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/CallStackViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Call Stack viewer widget.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QFileInfo
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, QFileInfo
+from PyQt6.QtWidgets import (
     QTreeWidget, QTreeWidgetItem, QMenu, QWidget, QVBoxLayout, QLabel
 )
--- a/eric7/Debugger/CallTraceViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/CallTraceViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QFileInfo
-from PyQt5.QtWidgets import QWidget, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QFileInfo
+from PyQt6.QtWidgets import QWidget, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
--- a/eric7/Debugger/Config.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/Config.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module defining the different Python types and their display strings.
 """

-from PyQt5.QtCore import QT_TRANSLATE_NOOP
+from PyQt6.QtCore import QT_TRANSLATE_NOOP

 # Variable type definitions
 ConfigVarTypeDispStrings = {
--- a/eric7/Debugger/DebugServer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/DebugServer.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import shlex
 import contextlib

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QModelIndex
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QModelIndex
+from PyQt6.QtNetwork import (
     QTcpServer, QHostAddress, QHostInfo, QNetworkInterface
 )
--- a/eric7/Debugger/DebugUI.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/DebugUI.py	Sun May 16 20:07:24 2021 +0200
@@ -11,9 +11,9 @@
 import copy
 import contextlib

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import QMenu, QToolBar, QApplication, QDialog
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, Qt, QKeyCombination
+from PyQt6.QtGui import QKeySequence
+from PyQt6.QtWidgets import QMenu, QToolBar, QApplication, QDialog

 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5MessageBox
@@ -224,7 +224,7 @@
             self.tr('Run Project'),
             UI.PixmapCache.getIcon("runProject"),
             self.tr('Run &Project...'),
-            Qt.Modifier.SHIFT + Qt.Key.Key_F2,
+            QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F2),
             0, self, 'dbg_run_project')
         self.runProjectAct.setStatusTip(self.tr('Run the current Project'))
         self.runProjectAct.setWhatsThis(self.tr(
@@ -319,7 +319,7 @@
             self.tr('Debug Project'),
             UI.PixmapCache.getIcon("debugProject"),
             self.tr('Debug &Project...'),
-            Qt.Modifier.SHIFT + Qt.Key.Key_F5,
+            QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F5),
             0, self, 'dbg_debug_project')
         self.debugProjectAct.setStatusTip(self.tr(
             'Debug the current Project'))
@@ -352,7 +352,9 @@
         self.stopAct = E5Action(
             self.tr('Stop'),
             UI.PixmapCache.getIcon("stopScript"),
-            self.tr('Stop'), Qt.Modifier.SHIFT + Qt.Key.Key_F10, 0,
+            self.tr('Stop'),
+            QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F10),
+            0,
             self, 'dbg_stop_script')
         self.stopAct.setStatusTip(self.tr("""Stop the running script."""))
         self.stopAct.setWhatsThis(self.tr(
@@ -384,7 +386,7 @@
             self.tr('Continue to Cursor'),
             UI.PixmapCache.getIcon("continueToCursor"),
             self.tr('Continue &To Cursor'),
-            Qt.Modifier.SHIFT + Qt.Key.Key_F6,
+            QKeyCombination(Qt.Modifier.SHIFT, Qt.Key.Key_F6),
             0, self.debugActGrp, 'dbg_continue_to_cursor')
         act.setStatusTip(self.tr(
             """Continue running the program from the"""
@@ -400,7 +402,9 @@
         act = E5Action(
             self.tr('Continue Until'),
             UI.PixmapCache.getIcon("continueUntil"),
-            self.tr('Continue &Until'), Qt.Modifier.CTRL + Qt.Key.Key_F6, 0,
+            self.tr('Continue &Until'),
+            QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_F6),
+            0,
             self.debugActGrp, 'dbg_continue_until')
         act.setStatusTip(self.tr(
             """Continue running the program from the current line to the"""
--- a/eric7/Debugger/DebugViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/DebugViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -23,8 +23,8 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QSizePolicy, QPushButton,
     QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView, QSplitter
 )
--- a/eric7/Debugger/DebuggerInterfaceNone.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/DebuggerInterfaceNone.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dummy debugger interface for the debug server.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 ClientDefaultCapabilities = 0
--- a/eric7/Debugger/DebuggerInterfacePython.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/DebuggerInterfacePython.py	Sun May 16 20:07:24 2021 +0200
@@ -13,7 +13,7 @@
 import shlex
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QObject, QProcess, QProcessEnvironment, QTimer
 )
--- a/eric7/Debugger/EditBreakpointDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/EditBreakpointDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os.path

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Debugger/EditWatchpointDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/EditWatchpointDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit watch expression properties.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
--- a/eric7/Debugger/ExceptionLogger.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/ExceptionLogger.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import contextlib

-from PyQt5.QtCore import pyqtSignal, Qt
-from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu

 from E5Gui.E5Application import e5App
--- a/eric7/Debugger/ExceptionsFilterDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/ExceptionsFilterDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the exceptions filter dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog
--- a/eric7/Debugger/StartDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/StartDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
 from E5Gui.E5Application import e5App
--- a/eric7/Debugger/StartHistoryEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/StartHistoryEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit a list of history entries.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

 from E5Gui import E5MessageBox
--- a/eric7/Debugger/VariableDetailDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/VariableDetailDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the variable detail dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_VariableDetailDialog import Ui_VariableDetailDialog
--- a/eric7/Debugger/VariablesFilterDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/VariablesFilterDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the variables filter dialog.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

 from Debugger.Config import ConfigVarTypeDispStrings
 import Preferences
--- a/eric7/Debugger/VariablesViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/VariablesViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -11,12 +11,12 @@
 import re
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     Qt, QAbstractItemModel, QModelIndex, QCoreApplication,
     QSortFilterProxyModel, pyqtSignal
 )
-from PyQt5.QtGui import QBrush, QFontMetrics
-from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QToolTip, QMenu
+from PyQt6.QtGui import QBrush, QFontMetrics
+from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QToolTip, QMenu

 from E5Gui.E5Application import e5App
--- a/eric7/Debugger/WatchPointModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/WatchPointModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import copy

-from PyQt5.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex
+from PyQt6.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex


 class WatchPointModel(QAbstractItemModel):
@@ -37,11 +37,11 @@
             self.tr('Enabled'),
             self.tr('Ignore Count'),
         ]
-        self.alignments = [Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignLeft),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignHCenter),
-                           Qt.Alignment(Qt.AlignmentFlag.AlignRight),
+        self.alignments = [Qt.AlignmentFlag.AlignLeft,
+                           Qt.AlignmentFlag.AlignLeft,
+                           Qt.AlignmentFlag.AlignHCenter,
+                           Qt.AlignmentFlag.AlignHCenter,
+                           Qt.AlignmentFlag.AlignRight,
                            ]

     def columnCount(self, parent=None):
--- a/eric7/Debugger/WatchPointViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Debugger/WatchPointViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the watch expression viewer widget.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     Qt, QModelIndex, QItemSelectionModel, QSortFilterProxyModel
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QTreeView, QAbstractItemView, QMenu, QHeaderView, QDialog
 )

@@ -127,13 +127,11 @@
             return

         flags = (
-            QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.SelectionFlag.ClearAndSelect |
-                QItemSelectionModel.SelectionFlag.Rows)
+            (QItemSelectionModel.SelectionFlag.ClearAndSelect |
+             QItemSelectionModel.SelectionFlag.Rows)
             if selected else
-            QItemSelectionModel.SelectionFlags(
-                QItemSelectionModel.SelectionFlag.Deselect |
-                QItemSelectionModel.SelectionFlag.Rows)
+            (QItemSelectionModel.SelectionFlag.Deselect |
+             QItemSelectionModel.SelectionFlag.Rows)
         )
         self.selectionModel().select(index, flags)
--- a/eric7/E5Graphics/E5ArrowItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Graphics/E5ArrowItem.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import enum
 import math

-from PyQt5.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
-from PyQt5.QtGui import QPen, QPolygonF, QColor
-from PyQt5.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle
+from PyQt6.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
+from PyQt6.QtGui import QPen, QPolygonF, QColor
+from PyQt6.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle

 ArrowheadAngleFactor = 0.26179938779914941
 # That is: 0.5 * math.atan(math.sqrt(3.0) / 3.0)
--- a/eric7/E5Graphics/E5GraphicsView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Graphics/E5GraphicsView.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import sys

-from PyQt5.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt
-from PyQt5.QtGui import QBrush, QPainter, QPixmap, QFont, QColor
-from PyQt5.QtWidgets import QGraphicsView
+from PyQt6.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt
+from PyQt6.QtGui import QBrush, QPainter, QPixmap, QFont, QColor
+from PyQt6.QtWidgets import QGraphicsView

 from E5Gui.E5Application import e5App

@@ -49,8 +49,8 @@
         self.setBackgroundBrush(QBrush(self.getBackgroundColor()))
         self.setRenderHint(QPainter.RenderHint.Antialiasing, True)
         self.setDragMode(QGraphicsView.DragMode.RubberBandDrag)
-        self.setAlignment(Qt.Alignment(
-            Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop))
+        self.setAlignment(
+            Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop)
         self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
         self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
         self.setViewportUpdateMode(
@@ -304,7 +304,7 @@
             paintDevice = QPixmap(int(rect.width()), int(rect.height()))
             paintDevice.fill(self.backgroundBrush().color())
         else:
-            from PyQt5.QtSvg import QSvgGenerator
+            from PyQt6.QtSvg import QSvgGenerator
             paintDevice = QSvgGenerator()
             paintDevice.setResolution(100)  # 100 dpi
             paintDevice.setSize(QSize(int(rect.width()), int(rect.height())))
@@ -347,7 +347,7 @@
         """
         painter = QPainter(printer)

-        font = QFont("times", 10)
+        font = QFont(["times"], 10)
         painter.setFont(font)
         fm = painter.fontMetrics()
         fontHeight = fm.lineSpacing()
--- a/eric7/E5Gui/E5Action.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5Action.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,7 @@
 shortcuts.
 """

-from PyQt5.QtGui import QIcon, QKeySequence
-from PyQt5.QtWidgets import QAction, QActionGroup
+from PyQt6.QtGui import QIcon, QKeySequence, QAction, QActionGroup

 from E5Gui.E5Application import e5App
--- a/eric7/E5Gui/E5AnimatedLabel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5AnimatedLabel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a label widget showing an animated pixmap.
 """

-from PyQt5.QtCore import pyqtSlot, QTimer
-from PyQt5.QtGui import QPixmap
-from PyQt5.QtWidgets import QLabel
+from PyQt6.QtCore import pyqtSlot, QTimer
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import QLabel

 import UI.PixmapCache
--- a/eric7/E5Gui/E5AnimatedWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5AnimatedWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 # Code was inspired by qupzilla web browser
 #

-from PyQt5.QtCore import pyqtSlot, QTimeLine, QPoint
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, QTimeLine, QPoint
+from PyQt6.QtWidgets import QWidget


 class E5AnimatedWidget(QWidget):
--- a/eric7/E5Gui/E5Application.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5Application.py	Sun May 16 20:07:24 2021 +0200
@@ -7,13 +7,11 @@
 Class implementing a specialized application class.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtGui import QPalette
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtGui import QPalette
+from PyQt6.QtWidgets import QApplication

 QCoreApplication.setAttribute(
-    Qt.ApplicationAttribute.AA_EnableHighDpiScaling, True)
-QCoreApplication.setAttribute(
     Qt.ApplicationAttribute.AA_ShareOpenGLContexts, True)


@@ -32,8 +30,6 @@

         QCoreApplication.setAttribute(
             Qt.ApplicationAttribute.AA_DontCreateNativeWidgetSiblings, True)
-        QCoreApplication.setAttribute(
-            Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True)

         self.__objectRegistry = {}
         self.__pluginObjectRegistry = {}
--- a/eric7/E5Gui/E5ClickableLabel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ClickableLabel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a clickable label.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QPoint
-from PyQt5.QtWidgets import QLabel
+from PyQt6.QtCore import pyqtSignal, Qt, QPoint
+from PyQt6.QtWidgets import QLabel


 class E5ClickableLabel(QLabel):
@@ -41,15 +41,15 @@
         """
         if (
             evt.button() == Qt.MouseButton.LeftButton and
-            self.rect().contains(evt.pos())
+            self.rect().contains(evt.position().toPoint())
         ):
             if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
                 self.middleClicked.emit(evt.globalPos())
             else:
                 self.clicked.emit(evt.globalPos())
         elif (
-            evt.button() == Qt.MouseButton.MidButton and
-            self.rect().contains(evt.pos())
+            evt.button() == Qt.MouseButton.MiddleButton and
+            self.rect().contains(evt.position().toPoint())
         ):
             self.middleClicked.emit(evt.globalPos())
         else:
--- a/eric7/E5Gui/E5ComboBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ComboBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing combobox classes using the eric line edits.
 """

-from PyQt5.QtWidgets import QComboBox
+from PyQt6.QtWidgets import QComboBox


 class E5ComboBox(QComboBox):
--- a/eric7/E5Gui/E5ComboSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ComboSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select one entry from a list of strings.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_E5ComboSelectionDialog import Ui_E5ComboSelectionDialog
--- a/eric7/E5Gui/E5Completers.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5Completers.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,9 @@

 import os

-from PyQt5.QtCore import QDir, Qt, QStringListModel
-from PyQt5.QtWidgets import QCompleter, QFileSystemModel
+from PyQt6.QtCore import QDir, Qt, QStringListModel
+from PyQt6.QtGui import QFileSystemModel
+from PyQt6.QtWidgets import QCompleter

 from Globals import isWindowsPlatform

@@ -34,18 +35,18 @@
         super().__init__(parent)
         self.__model = QFileSystemModel(self)
         if showHidden:
-            self.__model.setFilter(QDir.Filters(
+            self.__model.setFilter(
                 QDir.Filter.Dirs |
                 QDir.Filter.Files |
                 QDir.Filter.Drives |
                 QDir.Filter.AllDirs |
-                QDir.Filter.Hidden))
+                QDir.Filter.Hidden)
         else:
-            self.__model.setFilter(QDir.Filters(
+            self.__model.setFilter(
                 QDir.Filter.Dirs |
                 QDir.Filter.Files |
                 QDir.Filter.Drives |
-                QDir.Filter.AllDirs))
+                QDir.Filter.AllDirs)
         self.__model.setRootPath("")
         self.setModel(self.__model)
         self.setCompletionMode(completionMode)
@@ -94,13 +95,13 @@
         super().__init__(parent)
         self.__model = QFileSystemModel(self)
         if showHidden:
-            self.__model.setFilter(QDir.Filters(
+            self.__model.setFilter(
                 QDir.Filter.Drives |
                 QDir.Filter.AllDirs |
-                QDir.Filter.Hidden))
+                QDir.Filter.Hidden)
         else:
             self.__model.setFilter(
-                QDir.Filters(QDir.Filter.Drives | QDir.Filter.AllDirs))
+                QDir.Filter.Drives | QDir.Filter.AllDirs)
         self.__model.setRootPath("")
         self.setModel(self.__model)
         self.setCompletionMode(completionMode)
--- a/eric7/E5Gui/E5ErrorMessage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ErrorMessage.py	Sun May 16 20:07:24 2021 +0200
@@ -9,11 +9,11 @@

 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     qInstallMessageHandler, Qt, Q_ARG, QSettings, QtMsgType, QThread,
     QMetaObject
 )
-from PyQt5.QtWidgets import QErrorMessage, QDialog
+from PyQt6.QtWidgets import QErrorMessage, QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/E5Gui/E5ErrorMessageFilterDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ErrorMessageFilterDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the list of messages to be ignored.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_E5ErrorMessageFilterDialog import Ui_E5ErrorMessageFilterDialog
--- a/eric7/E5Gui/E5FileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5FileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,11 +8,11 @@
 to cope with distributor's usage of KDE wrapper dialogs for Qt file dialogs.
 """

-from PyQt5.QtWidgets import QFileDialog
+from PyQt6.QtWidgets import QFileDialog

 import Globals

-Options = QFileDialog.Options
+##Options = QFileDialog.Options
 Option = QFileDialog.Option

 ShowDirsOnly = QFileDialog.Option.ShowDirsOnly
@@ -21,7 +21,7 @@
 DontUseNativeDialog = QFileDialog.Option.DontUseNativeDialog
 ReadOnly = QFileDialog.Option.ReadOnly
 HideNameFilterDetails = QFileDialog.Option.HideNameFilterDetails
-DontUseSheet = QFileDialog.Option.DontUseSheet
+##DontUseSheet = QFileDialog.Option.DontUseSheet
 DontUseCustomDirectoryIcons = QFileDialog.Option.DontUseCustomDirectoryIcons


@@ -56,10 +56,13 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be opened (string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileName(
         parent, caption, directory, filterStr, "", options)[0]

@@ -79,10 +82,13 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be opened and selected filter (string, string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileName(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -100,10 +106,13 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return list of file names to be opened (list of string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, filterStr, "", options)[0]

@@ -124,10 +133,13 @@
     @return list of file names to be opened and selected filter
         (list of string, string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -145,10 +157,13 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be saved (string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getSaveFileName(
         parent, caption, directory, filterStr, "", options)[0]

@@ -168,10 +183,13 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be saved and selected filter (string, string)
     """
-    if options is None:
-        options = QFileDialog.Options()
+##    if options is None:
+##        options = QFileDialog.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getSaveFileName(
         parent, caption, directory, newfilter, initialFilter, options)
--- a/eric7/E5Gui/E5FileSaveConfirmDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5FileSaveConfirmDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel

 from .E5PathPicker import E5PathPicker, E5PathPickerModes
 from .E5LineEdit import E5ClearableLineEdit
--- a/eric7/E5Gui/E5GenericDiffHighlighter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5GenericDiffHighlighter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.QtGui import QSyntaxHighlighter, QTextCharFormat, QFont
+from PyQt6.QtGui import QSyntaxHighlighter, QTextCharFormat, QFont

 import Preferences

@@ -102,7 +102,7 @@
         """
         font = Preferences.getEditorOtherFonts("MonospacedFont")
         charFormat = QTextCharFormat()
-        charFormat.setFontFamily(font.family())
+        charFormat.setFontFamilies([font.family()])
         charFormat.setFontPointSize(font.pointSize())

         if fg:
--- a/eric7/E5Gui/E5Led.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5Led.py	Sun May 16 20:07:24 2021 +0200
@@ -11,9 +11,9 @@

 import enum

-from PyQt5.QtCore import pyqtSignal, Qt, QSize, QPoint
-from PyQt5.QtGui import QColor, QRadialGradient, QPalette, QPainter, QBrush
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSignal, Qt, QSize, QPoint
+from PyQt6.QtGui import QColor, QRadialGradient, QPalette, QPainter, QBrush
+from PyQt6.QtWidgets import QWidget


 class E5LedType(enum.Enum):
@@ -321,15 +321,15 @@
         """
         if (
             evt.button() == Qt.MouseButton.LeftButton and
-            self.rect().contains(evt.pos())
+            self.rect().contains(evt.position().toPoint())
         ):
             if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
                 self.middleClicked.emit(evt.globalPos())
             else:
                 self.clicked.emit(evt.globalPos())
         elif (
-            evt.button() == Qt.MouseButton.MidButton and
-            self.rect().contains(evt.pos())
+            evt.button() == Qt.MouseButton.MiddleButton and
+            self.rect().contains(evt.position().toPoint())
         ):
             self.middleClicked.emit(evt.globalPos())
         else:
--- a/eric7/E5Gui/E5LineEdit.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5LineEdit.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import enum

-from PyQt5.QtCore import pyqtSignal, Qt, QEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, QEvent
+from PyQt6.QtWidgets import (
     QLineEdit, QWidget, QHBoxLayout, QBoxLayout, QLayout, QApplication,
     QSpacerItem, QSizePolicy
 )
--- a/eric7/E5Gui/E5LineEditButton.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5LineEditButton.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a button class to be used with E5LineEdit.
 """

-from PyQt5.QtCore import Qt, QPoint, QPointF
-from PyQt5.QtGui import QPainter, QPainterPath
-from PyQt5.QtWidgets import QAbstractButton
+from PyQt6.QtCore import Qt, QPoint, QPointF
+from PyQt6.QtGui import QPainter, QPainterPath
+from PyQt6.QtWidgets import QAbstractButton


 class E5LineEditButton(QAbstractButton):
--- a/eric7/E5Gui/E5ListSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ListSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select from a list of strings.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem
 )
--- a/eric7/E5Gui/E5ListView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ListView.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing specialized list views.
 """

-from PyQt5.QtCore import Qt, QItemSelectionModel
-from PyQt5.QtWidgets import QListView
+from PyQt6.QtCore import Qt, QItemSelectionModel
+from PyQt6.QtWidgets import QListView


 class E5ListView(QListView):
--- a/eric7/E5Gui/E5MainWindow.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5MainWindow.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a main window class with styling support.
 """

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtWidgets import QMainWindow, QStyleFactory, QApplication
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QMainWindow, QStyleFactory, QApplication

 from .E5Application import e5App
 from . import E5MessageBox
--- a/eric7/E5Gui/E5MapWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5MapWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a base class for showing a document map.
 """

-from PyQt5.QtCore import Qt, QSize, QRect, QCoreApplication
-from PyQt5.QtGui import QColor, QBrush, QPainter
-from PyQt5.QtWidgets import QWidget, QAbstractScrollArea
+from PyQt6.QtCore import Qt, QSize, QRect, QCoreApplication
+from PyQt6.QtGui import QColor, QBrush, QPainter
+from PyQt6.QtWidgets import QWidget, QAbstractScrollArea


 class E5MapWidget(QWidget):
@@ -227,7 +227,7 @@
         """
         if event.button() == Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
-            value = self.position2Value(event.pos().y() - 1)
+            value = self.position2Value(event.position().toPoint().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page
         self.__mousePressPos = None

@@ -239,7 +239,7 @@
         """
         if event.buttons() & Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
-            value = self.position2Value(event.pos().y() - 1)
+            value = self.position2Value(event.position().toPoint().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page

     def wheelEvent(self, event):
--- a/eric7/E5Gui/E5MessageBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5MessageBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing QMessageBox replacements and more convenience function.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QMessageBox, QApplication
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QMessageBox, QApplication

 ###############################################################################
 ##  Mappings to standard QMessageBox                                         ##
@@ -21,8 +21,8 @@
 Question = QMessageBox.Icon.Question
 Warning = QMessageBox.Icon.Warning       # __IGNORE_WARNING_M131__

-StandardButtons = QMessageBox.StandardButtons
-
+##StandardButtons = QMessageBox.StandardButtons
+##
 # QMessageBox.StandardButton
 Abort = QMessageBox.StandardButton.Abort
 Apply = QMessageBox.StandardButton.Apply
@@ -246,8 +246,7 @@

     res = __messageBox(
         parent, title, text, icon,
-        QMessageBox.StandardButtons(QMessageBox.StandardButton.Yes |
-                                    QMessageBox.StandardButton.No),
+        QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
         yesDefault and QMessageBox.StandardButton.Yes or
         QMessageBox.StandardButton.No,
         textFormat)
@@ -273,8 +272,7 @@

     res = __messageBox(
         parent, title, text, icon,
-        QMessageBox.StandardButtons(QMessageBox.StandardButton.Retry |
-                                    QMessageBox.StandardButton.Abort),
+        QMessageBox.StandardButton.Retry | QMessageBox.StandardButton.Abort,
         QMessageBox.StandardButton.Retry,
         textFormat)
     return res == QMessageBox.StandardButton.Retry
@@ -295,10 +293,9 @@
     """
     res = __messageBox(
         parent, title, text, QMessageBox.Icon.Warning,
-        QMessageBox.StandardButtons(
-            QMessageBox.StandardButton.Abort |
-            QMessageBox.StandardButton.Discard |
-            QMessageBox.StandardButton.Save),
+        (QMessageBox.StandardButton.Abort |
+         QMessageBox.StandardButton.Discard |
+         QMessageBox.StandardButton.Save),
         QMessageBox.StandardButton.Save,
         textFormat)
     if res == QMessageBox.StandardButton.Abort:
--- a/eric7/E5Gui/E5ModelMenu.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ModelMenu.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
-from PyQt5.QtGui import QFontMetrics, QDrag
-from PyQt5.QtWidgets import QMenu, QAction, QApplication
+from PyQt6.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
+from PyQt6.QtGui import QFontMetrics, QDrag, QAction
+from PyQt6.QtWidgets import QMenu, QApplication

 import UI.PixmapCache

@@ -326,7 +326,7 @@
         @param evt reference to the event (QDropEvent)
         """
         if self.__model is not None:
-            act = self.actionAt(evt.pos())
+            act = self.actionAt(evt.position().toPoint())
             parentIndex = self.__root
             if act is None:
                 row = self.__model.rowCount(self.__root)
@@ -357,7 +357,7 @@
         @param evt reference to the event object (QMouseEvent)
         """
         if evt.button() == Qt.MouseButton.LeftButton:
-            self.__dragStartPosition = evt.pos()
+            self.__dragStartPosition = evt.position().toPoint()
         super().mousePressEvent(evt)

     def mouseMoveEvent(self, evt):
@@ -378,7 +378,7 @@
             super().mouseMoveEvent(evt)
             return

-        manhattanLength = (evt.pos() -
+        manhattanLength = (evt.position().toPoint() -
                            self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
             super().mouseMoveEvent(evt)
--- a/eric7/E5Gui/E5ModelToolBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ModelToolBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
-from PyQt5.QtGui import QDrag, QIcon
-from PyQt5.QtWidgets import QApplication, QToolBar, QToolButton
+from PyQt6.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
+from PyQt6.QtGui import QDrag, QIcon
+from PyQt6.QtWidgets import QApplication, QToolBar, QToolButton


 class E5ModelToolBar(QToolBar):
@@ -126,7 +126,7 @@
                 menu = self._createMenu()
                 menu.setModel(self.__model)
                 menu.setRootIndex(idx)
-                act.setMenu(menu)
+                button.setMenu(menu)
                 button.setPopupMode(
                     QToolButton.ToolButtonPopupMode.InstantPopup)
                 button.setToolButtonStyle(
@@ -205,7 +205,7 @@
         @exception RuntimeError raised to indicate an invalid model index
         """
         if self.__model is not None:
-            act = self.actionAt(evt.pos())
+            act = self.actionAt(evt.position().toPoint())
             parentIndex = self.__root
             if act is None:
                 row = self.__model.rowCount(self.__root)
@@ -241,7 +241,7 @@
             super().mouseMoveEvent(evt)
             return

-        manhattanLength = (evt.pos() -
+        manhattanLength = (evt.position().toPoint() -
                            self.__dragStartPosition).manhattanLength()
         if manhattanLength <= QApplication.startDragDistance():
             super().mouseMoveEvent(evt)
--- a/eric7/E5Gui/E5OverrideCursor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5OverrideCursor.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QEventLoop
-from PyQt5.QtGui import QCursor, QGuiApplication
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QEventLoop
+from PyQt6.QtGui import QCursor, QGuiApplication


 class E5OverrideCursor(contextlib.AbstractContextManager):
--- a/eric7/E5Gui/E5PassivePopup.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5PassivePopup.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import enum

-from PyQt5.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect
-from PyQt5.QtWidgets import QFrame, QVBoxLayout, QApplication
+from PyQt6.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect
+from PyQt6.QtWidgets import QFrame, QVBoxLayout, QApplication


 class E5PassivePopupStyle(enum.Enum):
@@ -159,7 +159,7 @@
         @param evt reference to the mouse event (QMouseEvent)
         """
         self.clicked.emit()
-        self.clicked.emit(evt.pos())
+        self.clicked.emit(evt.position().toPoint())

     def hideEvent(self, evt):
         """
--- a/eric7/E5Gui/E5PasswordMeter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5PasswordMeter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a custom widget indicating the strength of a password.
 """

-from PyQt5.QtWidgets import QProgressBar
+from PyQt6.QtWidgets import QProgressBar

 from Utilities.PasswordChecker import PasswordChecker

@@ -93,7 +93,7 @@

 if __name__ == "__main__":
     import sys
-    from PyQt5.QtWidgets import QApplication
+    from PyQt6.QtWidgets import QApplication

     app = QApplication(sys.argv)
     meter = E5PasswordMeter()
--- a/eric7/E5Gui/E5PathPicker.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5PathPicker.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import enum
 import os

-from PyQt5.QtCore import pyqtSignal, Qt, QFileInfo, QCoreApplication, QDir
-from PyQt5.QtWidgets import QWidget, QHBoxLayout, QToolButton, QSizePolicy
+from PyQt6.QtCore import pyqtSignal, Qt, QFileInfo, QCoreApplication, QDir
+from PyQt6.QtWidgets import QWidget, QHBoxLayout, QToolButton, QSizePolicy

 from . import E5FileDialog
 from .E5LineEdit import E5ClearableLineEdit
--- a/eric7/E5Gui/E5PathPickerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5PathPickerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter a file system path using a file picker.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel

 from .E5PathPicker import E5PathPicker, E5PathPickerModes
--- a/eric7/E5Gui/E5PlainTextDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5PlainTextDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show some plain text.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QGuiApplication
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QGuiApplication
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_E5PlainTextDialog import Ui_E5PlainTextDialog
--- a/eric7/E5Gui/E5ProcessDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ProcessDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import os
 import re

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment
 )
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

 from E5Gui import E5MessageBox
--- a/eric7/E5Gui/E5ProgressDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ProgressDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a progress dialog allowing a customized progress bar label.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QProgressBar, QProgressDialog
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QProgressBar, QProgressDialog


 class E5ProgressDialog(QProgressDialog):
--- a/eric7/E5Gui/E5SideBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5SideBar.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import enum

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QEvent, QSize, Qt, QByteArray, QDataStream, QIODevice, QTimer
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QTabBar, QWidget, QStackedWidget, QBoxLayout, QToolButton, QSizePolicy
 )

@@ -248,7 +248,7 @@
         """
         if obj == self.__tabBar:
             if evt.type() == QEvent.Type.MouseButtonPress:
-                pos = evt.pos()
+                pos = evt.position().toPoint()
                 for i in range(self.__tabBar.count()):
                     if self.__tabBar.tabRect(i).contains(pos):
                         break
--- a/eric7/E5Gui/E5SimpleHelpDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5SimpleHelpDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show some help text.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_E5SimpleHelpDialog import Ui_E5SimpleHelpDialog
--- a/eric7/E5Gui/E5SqueezeLabels.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5SqueezeLabels.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 label.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QLabel
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QLabel

 from Utilities import compactPath
--- a/eric7/E5Gui/E5StringListEditWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5StringListEditWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a dialog to edit a list of strings.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QSortFilterProxyModel, QStringListModel
 )
-from PyQt5.QtWidgets import QWidget, QInputDialog, QLineEdit
+from PyQt6.QtWidgets import QWidget, QInputDialog, QLineEdit

 from .Ui_E5StringListEditWidget import Ui_E5StringListEditWidget
--- a/eric7/E5Gui/E5TabWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TabWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import contextlib

-from PyQt5.QtCore import pyqtSignal, Qt, QPoint, QMimeData
-from PyQt5.QtGui import QDrag
-from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle
+from PyQt6.QtCore import pyqtSignal, Qt, QPoint, QMimeData
+from PyQt6.QtGui import QDrag
+from PyQt6.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle

 from E5Gui.E5AnimatedLabel import E5AnimatedLabel

@@ -73,7 +73,7 @@
         @param event reference to the mouse press event (QMouseEvent)
         """
         if event.button() == Qt.MouseButton.LeftButton:
-            self.__dragStartPos = QPoint(event.pos())
+            self.__dragStartPos = QPoint(event.position().toPoint())
         E5WheelTabBar.mousePressEvent(self, event)

     def mouseMoveEvent(self, event):
@@ -84,12 +84,12 @@
         """
         if (
             event.buttons() == Qt.MouseButtons(Qt.MouseButton.LeftButton) and
-            (event.pos() - self.__dragStartPos).manhattanLength() >
+            (event.position().toPoint() - self.__dragStartPos).manhattanLength() >
             QApplication.startDragDistance()
         ):
             drag = QDrag(self)
             mimeData = QMimeData()
-            index = self.tabAt(event.pos())
+            index = self.tabAt(event.position().toPoint())
             mimeData.setText(self.tabText(index))
             mimeData.setData("action", b"tab-reordering")
             mimeData.setData("tabbar-id", str(id(self)).encode("utf-8"))
@@ -121,7 +121,7 @@
         @param event reference to the drop event (QDropEvent)
         """
         fromIndex = self.tabAt(self.__dragStartPos)
-        toIndex = self.tabAt(event.pos())
+        toIndex = self.tabAt(event.position().toPoint())
         if fromIndex != toIndex:
             self.tabMoveRequested.emit(fromIndex, toIndex)
             event.acceptProposedAction()
--- a/eric7/E5Gui/E5TableView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TableView.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing specialized table views.
 """

-from PyQt5.QtCore import Qt, QItemSelectionModel
-from PyQt5.QtWidgets import QTableView
+from PyQt6.QtCore import Qt, QItemSelectionModel
+from PyQt6.QtWidgets import QTableView


 class E5TableView(QTableView):
--- a/eric7/E5Gui/E5TextEditSearchWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TextEditSearchWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import enum

-from PyQt5.QtCore import pyqtSlot, Qt, QMetaObject, QSize
-from PyQt5.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QMetaObject, QSize
+from PyQt6.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QCheckBox,
     QToolButton, QSizePolicy
 )
@@ -335,7 +335,7 @@
         @param backwards flag indicating a backwards search
         @type bool
         """
-        from PyQt5.QtWebEngineWidgets import QWebEnginePage
+        from PyQt6.QtWebEngineWidgets import QWebEnginePage

         findFlags = QWebEnginePage.FindFlags()
         if self.caseCheckBox.isChecked():
--- a/eric7/E5Gui/E5TextInputDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TextInputDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter some text.
 """

-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit
 )
--- a/eric7/E5Gui/E5TextSpinBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TextSpinBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a spinbox with textual entries.
 """

-from PyQt5.QtWidgets import QSpinBox
+from PyQt6.QtWidgets import QSpinBox


 class E5TextSpinBox(QSpinBox):
--- a/eric7/E5Gui/E5ToolBarDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ToolBarDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a toolbar configuration dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QTreeWidgetItem, QInputDialog, QLineEdit,
     QListWidgetItem, QAbstractButton
 )
@@ -100,7 +100,7 @@
                 item.setData(0, E5ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(0, E5ToolBarDialog.WidgetActionRole, True)
-                    item.setData(0, Qt.ItemDataRole.TextColorRole,
+                    item.setData(0, Qt.ItemDataRole.ForegroundRole,
                                  QColor(Qt.GlobalColor.blue))
                     self.__widgetActionToToolBarItemID[id(action)] = None
             categoryItem.setExpanded(True)
@@ -276,7 +276,7 @@
                 item.setData(E5ToolBarDialog.WidgetActionRole, False)
                 if self.__manager.isWidgetAction(action):
                     item.setData(E5ToolBarDialog.WidgetActionRole, True)
-                    item.setData(Qt.ItemDataRole.TextColorRole,
+                    item.setData(Qt.ItemDataRole.ForegroundRole,
                                  QColor(Qt.GlobalColor.blue))
         self.toolbarActionsList.setCurrentRow(0)

@@ -380,7 +380,7 @@
             item.setData(E5ToolBarDialog.WidgetActionRole, False)
             if self.__manager.isWidgetAction(action):
                 item.setData(E5ToolBarDialog.WidgetActionRole, True)
-                item.setData(Qt.ItemDataRole.TextColorRole,
+                item.setData(Qt.ItemDataRole.ForegroundRole,
                              QColor(Qt.GlobalColor.blue))
                 oldTbItemID = self.__widgetActionToToolBarItemID[actionID]
                 if oldTbItemID is not None:
--- a/eric7/E5Gui/E5ToolBarManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ToolBarManager.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a toolbar manager class.
 """

-from PyQt5.QtCore import QObject, QByteArray, QDataStream, QIODevice
-from PyQt5.QtWidgets import QToolBar
+from PyQt6.QtCore import QObject, QByteArray, QDataStream, QIODevice
+from PyQt6.QtWidgets import QToolBar

 import Utilities
--- a/eric7/E5Gui/E5ToolBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ToolBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a horizontal and a vertical toolbox class.
 """

-from PyQt5.QtWidgets import QToolBox, QTabWidget
+from PyQt6.QtWidgets import QToolBox, QTabWidget

 from .E5TabWidget import E5TabWidget
--- a/eric7/E5Gui/E5ToolButton.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ToolButton.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import enum

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTimer, QSize
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QTimer, QSize
+from PyQt6.QtWidgets import (
     QToolButton, QStyle, QStyleOptionToolButton, QStyleOption, QApplication,
     QLabel
 )
@@ -231,13 +231,13 @@

         if (
             evt.button() == Qt.MouseButton.MiddleButton and
-            self.rect().contains(evt.pos())
+            self.rect().contains(evt.position().toPoint())
         ):
             self.middleClicked.emit()
             self.setDown(False)
         elif (
             evt.button() == Qt.MouseButton.LeftButton and
-            self.rect().contains(evt.pos()) and
+            self.rect().contains(evt.position().toPoint()) and
             evt.modifiers() == Qt.KeyboardModifier.ControlModifier
         ):
             self.controlClicked.emit()
--- a/eric7/E5Gui/E5TreeSortFilterProxyModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TreeSortFilterProxyModel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a modified QSortFilterProxyModel.
 """

-from PyQt5.QtCore import Qt, QModelIndex, QSortFilterProxyModel
+from PyQt6.QtCore import Qt, QModelIndex, QSortFilterProxyModel


 class E5TreeSortFilterProxyModel(QSortFilterProxyModel):
--- a/eric7/E5Gui/E5TreeView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TreeView.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing specialized tree views.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QTreeView
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QTreeView


 class E5TreeView(QTreeView):
--- a/eric7/E5Gui/E5TreeWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5TreeWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import enum

-from PyQt5.QtCore import pyqtSignal, Qt
-from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView


 class E5TreeWidgetItemsState(enum.Enum):
@@ -258,10 +258,10 @@
             evt.modifiers() == Qt.KeyboardModifier.ControlModifier and
             evt.buttons() == Qt.MouseButton.LeftButton
         ):
-            self.itemControlClicked.emit(self.itemAt(evt.pos()))
+            self.itemControlClicked.emit(self.itemAt(evt.position().toPoint()))
             return
-        elif evt.buttons() == Qt.MouseButton.MidButton:
-            self.itemMiddleButtonClicked.emit(self.itemAt(evt.pos()))
+        elif evt.buttons() == Qt.MouseButton.MiddleButton:
+            self.itemMiddleButtonClicked.emit(self.itemAt(evt.position().toPoint()))
             return
         else:
             super().mousePressEvent(evt)
--- a/eric7/E5Gui/E5ZoomWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5ZoomWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a zoom widget for the status bar.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, pyqtSignal
+from PyQt6.QtWidgets import QWidget

 from .Ui_E5ZoomWidget import Ui_E5ZoomWidget
--- a/eric7/E5Network/E5GoogleMail.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5GoogleMail.py	Sun May 16 20:07:24 2021 +0200
@@ -17,8 +17,8 @@
 from google.oauth2.credentials import Credentials
 from requests_oauthlib import OAuth2Session

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QUrl, QUrlQuery
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject, QUrl, QUrlQuery
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout

 from E5Gui.E5TextInputDialog import E5TextInputDialog

@@ -50,7 +50,7 @@

         self.__layout = QVBoxLayout(self)

-        from PyQt5.QtWebEngineWidgets import QWebEngineView
+        from PyQt6.QtWebEngineWidgets import QWebEngineView
         self.__browser = QWebEngineView(self)
         self.__browser.titleChanged.connect(self.__titleChanged)
         self.__browser.loadFinished.connect(self.__pageLoadFinished)
@@ -191,7 +191,7 @@
                 self.__browser.show()
                 self.__browser.load(QUrl(authorizationUrl))
             else:
-                from PyQt5.QtGui import QDesktopServices
+                from PyQt6.QtGui import QDesktopServices
                 QDesktopServices.openUrl(QUrl(authorizationUrl))
                 ok, authCode = E5TextInputDialog.getText(
                     None,
--- a/eric7/E5Network/E5JsonServer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5JsonServer.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import contextlib
 import json

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, QProcess, QProcessEnvironment, QCoreApplication, QEventLoop,
     QTimer
 )
-from PyQt5.QtNetwork import QTcpServer, QHostAddress
+from PyQt6.QtNetwork import QTcpServer, QHostAddress

 from E5Gui import E5MessageBox
--- a/eric7/E5Network/E5NetworkHeaderDetailsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5NetworkHeaderDetailsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the data of a response or reply header.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_E5NetworkHeaderDetailsDialog import Ui_E5NetworkHeaderDetailsDialog
--- a/eric7/E5Network/E5NetworkProxyFactory.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5NetworkProxyFactory.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import os
 import re

-from PyQt5.QtCore import QUrl, QCoreApplication
-from PyQt5.QtWidgets import QDialog
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import QUrl, QCoreApplication
+from PyQt6.QtWidgets import QDialog
+from PyQt6.QtNetwork import (
     QNetworkProxyFactory, QNetworkProxy, QNetworkProxyQuery
 )
--- a/eric7/E5Network/E5SslCertificateSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslCertificateSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
 with contextlib.suppress(ImportError):
-    from PyQt5.QtNetwork import QSslCertificate
+    from PyQt6.QtNetwork import QSslCertificate

 from .Ui_E5SslCertificateSelectionDialog import (
     Ui_E5SslCertificateSelectionDialog
--- a/eric7/E5Network/E5SslCertificatesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslCertificatesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,12 +9,12 @@

 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QByteArray, QFile, QFileInfo, QIODevice
 )
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem
 with contextlib.suppress(ImportError):
-    from PyQt5.QtNetwork import (
+    from PyQt6.QtNetwork import (
         QSslCertificate, QSslSocket, QSslConfiguration, QSsl
     )
--- a/eric7/E5Network/E5SslCertificatesInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslCertificatesInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to show SSL certificate infos.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_E5SslCertificatesInfoDialog import Ui_E5SslCertificatesInfoDialog
--- a/eric7/E5Network/E5SslCertificatesInfoWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslCertificatesInfoWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a widget to show SSL certificate infos.
 """

-from PyQt5.QtCore import pyqtSlot, QCryptographicHash, QDateTime
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, QCryptographicHash, QDateTime
+from PyQt6.QtWidgets import QWidget
 try:
-    from PyQt5.QtNetwork import QSslCertificate
+    from PyQt6.QtNetwork import QSslCertificate
 except ImportError:
     QSslCertificate = None
--- a/eric7/E5Network/E5SslErrorHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslErrorHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -11,10 +11,8 @@
 import enum
 import platform

-from PyQt5.QtCore import QObject, QByteArray
-from PyQt5.QtNetwork import (
-    QSslCertificate, QSslConfiguration, QSslSocket, QSslError, QSsl
-)
+from PyQt6.QtCore import QObject, QByteArray
+from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration, QSslError, QSsl

 from E5Gui import E5MessageBox

@@ -271,5 +269,5 @@
         caList = QSslCertificate.fromData(Globals.toByteArray(
             Preferences.Prefs.settings.value("Ssl/SystemCertificates")))
         if not caList:
-            caList = QSslSocket.systemCaCertificates()
+            caList = QSslConfiguration.systemCaCertificates()
         return caList
--- a/eric7/E5Network/E5SslInfoWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslInfoWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a widget to show SSL information.
 """

-from PyQt5.QtCore import Qt, QUrl, QPoint
-from PyQt5.QtWidgets import QMenu, QGridLayout, QLabel, QSizePolicy
-from PyQt5.QtNetwork import QSsl, QSslConfiguration, QSslCertificate
+from PyQt6.QtCore import Qt, QUrl, QPoint
+from PyQt6.QtWidgets import QMenu, QGridLayout, QLabel, QSizePolicy
+from PyQt6.QtNetwork import QSsl, QSslConfiguration, QSslCertificate

 import UI.PixmapCache
 import Utilities
--- a/eric7/E5Network/E5SslUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5SslUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -18,11 +18,13 @@
     ]

     try:
-        from PyQt5.QtNetwork import QSslSocket
+        from PyQt6.QtNetwork import QSslConfiguration
     except ImportError:
         # no SSL available, so there is nothing to initialize
         return

-    strongCiphers = [c for c in QSslSocket.supportedCiphers()
+    strongCiphers = [c for c in QSslConfiguration.supportedCiphers()
                      if c.name() not in blacklist and c.usedBits() >= 128]
-    QSslSocket.setDefaultCiphers(strongCiphers)
+    defaultSslConfiguration = QSslConfiguration.defaultConfiguration()
+    defaultSslConfiguration.setCiphers(strongCiphers)
+    QSslConfiguration.setDefaultConfiguration(defaultSslConfiguration)
--- a/eric7/E5Network/E5TldExtractor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5TldExtractor.py	Sun May 16 20:07:24 2021 +0200
@@ -16,7 +16,7 @@
 import os
 import re

-from PyQt5.QtCore import QObject, QUrl, QFile, QFileInfo, qWarning
+from PyQt6.QtCore import QObject, QUrl, QFile, QFileInfo, qWarning

 from E5Gui import E5MessageBox
--- a/eric7/E5Network/E5UrlInfo.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5UrlInfo.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import enum

-from PyQt5.QtCore import QDateTime
+from PyQt6.QtCore import QDateTime


 class E5UrlPermission(enum.IntEnum):
--- a/eric7/E5Network/E5XmlRpcClient.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/E5XmlRpcClient.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import xmlrpc.client as xmlrpc

-from PyQt5.QtCore import Qt, QObject, QUrl, QByteArray, QEventLoop
-from PyQt5.QtGui import QGuiApplication, QCursor
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import Qt, QObject, QUrl, QByteArray, QEventLoop
+from PyQt6.QtGui import QGuiApplication, QCursor
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
--- a/eric7/E5Network/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Network/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Package implementing some special network related objects and functions.
 """

-from PyQt5.QtNetwork import QAbstractSocket, QHostAddress
+from PyQt6.QtNetwork import QAbstractSocket, QHostAddress


 def isValidAddress(address):
--- a/eric7/E5Utilities/E5Cache.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Utilities/E5Cache.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing classes used for caching objects.
 """

-from PyQt5.QtCore import QDateTime, QTimer
+from PyQt6.QtCore import QDateTime, QTimer


 class E5Cache:
--- a/eric7/E5XML/MultiProjectReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5XML/MultiProjectReader.py	Sun May 16 20:07:24 2021 +0200
@@ -85,7 +85,7 @@
             project["uid"] = uid
         else:
             # upgrade from pre 5.1 format
-            from PyQt5.QtCore import QUuid
+            from PyQt6.QtCore import QUuid
             project["uid"] = QUuid.createUuid().toString()

         while not self.atEnd():
--- a/eric7/E5XML/PluginRepositoryReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5XML/PluginRepositoryReader.py	Sun May 16 20:07:24 2021 +0200
@@ -48,7 +48,7 @@
                         self.raiseUnsupportedFormatVersion(self.version)
                 elif self.name() == "RepositoryUrl":
                     url = self.readElementText()
-                    Preferences.setUI("PluginRepositoryUrl6", url)
+                    Preferences.setUI("PluginRepositoryUrl7", url)
                 elif self.name() == "Plugin":
                     self.__readPlugin()
                 else:
--- a/eric7/E5XML/TasksReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5XML/TasksReader.py	Sun May 16 20:07:24 2021 +0200
@@ -106,7 +106,7 @@
             task["uid"] = uid
         else:
             # upgrade from pre 6.0 format
-            from PyQt5.QtCore import QUuid
+            from PyQt6.QtCore import QUuid
             task["uid"] = QUuid.createUuid().toString()
         parentUid = self.attribute("parent_uid", "")
         expanded = self.toBool(self.attribute("expanded", "True"))
--- a/eric7/E5XML/XMLStreamReaderBase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5XML/XMLStreamReaderBase.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import pickle           # secok
 import base64

-from PyQt5.QtCore import QXmlStreamReader, QCoreApplication
+from PyQt6.QtCore import QXmlStreamReader, QCoreApplication

 from E5Gui import E5MessageBox
--- a/eric7/E5XML/XMLStreamWriterBase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5XML/XMLStreamWriterBase.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import pickle           # secok
 import base64

-from PyQt5.QtCore import QXmlStreamWriter
+from PyQt6.QtCore import QXmlStreamWriter


 class XMLStreamWriterBase(QXmlStreamWriter):
--- a/eric7/Globals/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Globals/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -17,14 +17,14 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QDir, QByteArray, QCoreApplication, QT_VERSION, QProcess, qVersion
 )

 from eric7config import getConfig

 # names of the various settings objects
-settingsNameOrganization = "Eric6"
+settingsNameOrganization = "Eric7"
 settingsNameGlobal = "eric7"
 settingsNameRecent = "eric7recent"

@@ -33,7 +33,7 @@
 recentNameProject = "Projects"
 recentNameFiles = "Files"
 recentNameHexFiles = "HexFiles"
-recentNameHosts = "Hosts6"
+recentNameHosts = "Hosts"
 recentNameBreakpointFiles = "BreakPointFiles"
 recentNameBreakpointConditions = "BreakPointConditions"
--- a/eric7/Graphics/ApplicationDiagramBuilder.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/ApplicationDiagramBuilder.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import glob

-from PyQt5.QtWidgets import QApplication, QInputDialog
+from PyQt6.QtWidgets import QApplication, QInputDialog

 from E5Gui import E5MessageBox
 from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/eric7/Graphics/AssociationItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/AssociationItem.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import enum

-from PyQt5.QtCore import QPointF, QRectF, QLineF
-from PyQt5.QtWidgets import QGraphicsItem
+from PyQt6.QtCore import QPointF, QRectF, QLineF
+from PyQt6.QtWidgets import QGraphicsItem

 from E5Graphics.E5ArrowItem import E5ArrowItem, E5ArrowType
--- a/eric7/Graphics/ClassItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/ClassItem.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing an UML like class item.
 """

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtGui import QFont
+from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
--- a/eric7/Graphics/ImportsDiagramBuilder.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/ImportsDiagramBuilder.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import glob
 import os

-from PyQt5.QtWidgets import QApplication, QGraphicsTextItem
+from PyQt6.QtWidgets import QApplication, QGraphicsTextItem

 from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/eric7/Graphics/ModuleItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/ModuleItem.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a module item.
 """

-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle
+from PyQt6.QtGui import QFont
+from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
--- a/eric7/Graphics/PackageDiagramBuilder.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/PackageDiagramBuilder.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import os.path
 from itertools import zip_longest

-from PyQt5.QtWidgets import QApplication, QGraphicsTextItem
+from PyQt6.QtWidgets import QApplication, QGraphicsTextItem

 from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/eric7/Graphics/PackageItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/PackageItem.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a package item.
 """

-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle
+from PyQt6.QtGui import QFont
+from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

 from .UMLItem import UMLModel, UMLItem
--- a/eric7/Graphics/PixmapDiagram.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/PixmapDiagram.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,14 @@
 Module implementing a dialog showing a pixmap.
 """

-from PyQt5.QtCore import Qt, QSize, QEvent
-from PyQt5.QtGui import QPalette, QImage, QPixmap, QPainter, QFont, QColor
-from PyQt5.QtWidgets import (
-    QLabel, QSizePolicy, QScrollArea, QAction, QMenu, QToolBar
+from PyQt6.QtCore import Qt, QSize, QEvent
+from PyQt6.QtGui import (
+    QPalette, QImage, QPixmap, QPainter, QFont, QColor, QAction
 )
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtWidgets import (
+    QLabel, QSizePolicy, QScrollArea, QMenu, QToolBar
+)
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog

 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
@@ -344,7 +346,7 @@
         """
         Private slot called to show a print preview of the diagram.
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog

         printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
@@ -380,7 +382,7 @@
         painter.begin(printer)

         # calculate margin and width of printout
-        font = QFont("times", 10)
+        font = QFont(["times"], 10)
         painter.setFont(font)
         fm = painter.fontMetrics()
         fontHeight = fm.lineSpacing()
--- a/eric7/Graphics/SvgDiagram.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/SvgDiagram.py	Sun May 16 20:07:24 2021 +0200
@@ -7,11 +7,11 @@
 Module implementing a dialog showing a SVG graphic.
 """

-from PyQt5.QtCore import Qt, QSize, QEvent
-from PyQt5.QtGui import QPalette, QPainter, QFont, QColor
-from PyQt5.QtWidgets import QSizePolicy, QScrollArea, QAction, QMenu, QToolBar
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
-from PyQt5.QtSvg import QSvgWidget
+from PyQt6.QtCore import Qt, QSize, QEvent
+from PyQt6.QtGui import QPalette, QPainter, QFont, QColor, QAction
+from PyQt6.QtWidgets import QSizePolicy, QScrollArea, QMenu, QToolBar
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtSvg import QSvgWidget

 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5ZoomWidget import E5ZoomWidget
@@ -311,7 +311,7 @@
         """
         Private slot called to show a print preview of the diagram.
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog

         printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
         printer.setFullPage(True)
@@ -349,7 +349,7 @@
         painter.begin(printer)

         # calculate margin and width of printout
-        font = QFont("times", 10)
+        font = QFont(["times"], 10)
         painter.setFont(font)
         fm = painter.fontMetrics()
         fontHeight = fm.lineSpacing()
--- a/eric7/Graphics/UMLClassDiagramBuilder.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLClassDiagramBuilder.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 from itertools import zip_longest
 import os

-from PyQt5.QtWidgets import QGraphicsTextItem
+from PyQt6.QtWidgets import QGraphicsTextItem

 import Utilities
 import Preferences
--- a/eric7/Graphics/UMLDiagramBuilder.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLDiagramBuilder.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the UML diagram builder base class.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 class UMLDiagramBuilder(QObject):
--- a/eric7/Graphics/UMLDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,9 @@
 import enum
 import json

-from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo, QCoreApplication
-from PyQt5.QtWidgets import QAction, QToolBar, QGraphicsScene
+from PyQt6.QtCore import pyqtSlot, Qt, QFileInfo, QCoreApplication
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import QToolBar, QGraphicsScene

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5MainWindow import E5MainWindow
--- a/eric7/Graphics/UMLGraphicsView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLGraphicsView.py	Sun May 16 20:07:24 2021 +0200
@@ -7,11 +7,12 @@
 Module implementing a subclass of E5GraphicsView for our diagrams.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, QRectF
 )
-from PyQt5.QtWidgets import QGraphicsView, QAction, QToolBar, QDialog
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import QGraphicsView, QToolBar, QDialog
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog

 from E5Graphics.E5GraphicsView import E5GraphicsView

@@ -460,7 +461,7 @@
         """
         Public slot called to show a print preview of the diagram.
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog

         printer = QPrinter(mode=QPrinter.PrinterMode.PrinterResolution)
         printer.setFullPage(True)
--- a/eric7/Graphics/UMLItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLItem.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the UMLItem base class.
 """

-from PyQt5.QtCore import Qt, QSizeF
-from PyQt5.QtGui import QColor, QPen
-from PyQt5.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle
+from PyQt6.QtCore import Qt, QSizeF
+from PyQt6.QtGui import QColor, QPen
+from PyQt6.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle

 import Preferences
--- a/eric7/Graphics/UMLSceneSizeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Graphics/UMLSceneSizeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to set the scene sizes.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_UMLSceneSizeDialog import Ui_UMLSceneSizeDialog
--- a/eric7/HexEdit/HexEditChunks.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditChunks.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import sys

-from PyQt5.QtCore import QBuffer, QIODevice, QByteArray
+from PyQt6.QtCore import QBuffer, QIODevice, QByteArray


 class HexEditChunk:
--- a/eric7/HexEdit/HexEditGotoWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditGotoWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a movement (goto) widget for the hex editor.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, Qt, QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import QWidget

 from .Ui_HexEditGotoWidget import Ui_HexEditGotoWidget
--- a/eric7/HexEdit/HexEditMainWindow.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditMainWindow.py	Sun May 16 20:07:24 2021 +0200
@@ -10,12 +10,12 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QFile, QFileInfo, QSize, QCoreApplication, QLocale
 )
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import (
-    QWhatsThis, QLabel, QWidget, QVBoxLayout, QDialog, QAction, QFrame, QMenu
+from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtWidgets import (
+    QWhatsThis, QLabel, QWidget, QVBoxLayout, QDialog, QFrame, QMenu
 )

 from E5Gui.E5Action import E5Action
--- a/eric7/HexEdit/HexEditSearchReplaceWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditSearchReplaceWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a search and replace widget for the hex editor.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QByteArray, QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, Qt, QByteArray, QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import QWidget

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/HexEdit/HexEditUndoStack.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditUndoStack.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import enum

-from PyQt5.QtWidgets import QUndoStack, QUndoCommand
+from PyQt6.QtGui import QUndoStack, QUndoCommand


 class HexEditCommand(enum.Enum):
--- a/eric7/HexEdit/HexEditWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/HexEdit/HexEditWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,13 +9,13 @@

 import math

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QByteArray, QTimer, QRect, QBuffer, QIODevice
 )
-from PyQt5.QtGui import (
+from PyQt6.QtGui import (
     QBrush, QPen, QColor, QFont, QPalette, QKeySequence, QPainter
 )
-from PyQt5.QtWidgets import QAbstractScrollArea, QApplication
+from PyQt6.QtWidgets import QAbstractScrollArea, QApplication

 from .HexEditChunks import HexEditChunks
 from .HexEditUndoStack import HexEditUndoStack
@@ -129,9 +129,9 @@
         self.__chunks = HexEditChunks()
         self.__undoStack = HexEditUndoStack(self.__chunks, self)
         if Globals.isWindowsPlatform():
-            self.setFont(QFont("Courier", 10))
+            self.setFont(QFont(["Courier"], 10))
         else:
-            self.setFont(QFont("Monospace", 10))
+            self.setFont(QFont(["Monospace"], 10))

         self.setAddressAreaColors(
             self.palette().color(QPalette.ColorRole.WindowText),
@@ -1326,7 +1326,7 @@
         """
         self.__blink = False
         self.viewport().update()
-        actPos = self.cursorPositionFromPoint(evt.pos())
+        actPos = self.cursorPositionFromPoint(evt.position().toPoint())
         if actPos >= 0:
             self.setCursorPosition(actPos)
             self.__setSelection(actPos)
@@ -1340,7 +1340,7 @@
         """
         self.__blink = False
         self.viewport().update()
-        cPos = self.cursorPositionFromPoint(evt.pos())
+        cPos = self.cursorPositionFromPoint(evt.position().toPoint())
         if cPos >= 0:
             if evt.modifiers() == Qt.KeyboardModifier.ShiftModifier:
                 self.__setSelection(cPos)
--- a/eric7/IconEditor/IconEditorGrid.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/IconEditor/IconEditorGrid.py	Sun May 16 20:07:24 2021 +0200
@@ -9,13 +9,12 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QRect, QSize
-from PyQt5.QtGui import (
-    QImage, QColor, QPixmap, qRgba, QPainter, QCursor, QBrush, qGray, qAlpha
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QRect, QSize
+from PyQt6.QtGui import (
+    QImage, QColor, QPixmap, qRgba, QPainter, QCursor, QBrush, qGray, qAlpha,
+    QUndoCommand, QUndoStack
 )
-from PyQt5.QtWidgets import (
-    QUndoCommand, QWidget, QSizePolicy, QUndoStack, QApplication, QDialog
-)
+from PyQt6.QtWidgets import QWidget, QSizePolicy, QApplication, QDialog

 from E5Gui import E5MessageBox

@@ -486,19 +485,19 @@
             if self.__curTool == self.Pencil:
                 cmd = IconEditCommand(self, self.__undoTexts[self.__curTool],
                                       self.__image)
-                self.__setImagePixel(evt.pos(), True)
+                self.__setImagePixel(evt.position().toPoint(), True)
                 self.setDirty(True)
                 self.__undoStack.push(cmd)
                 self.__currentUndoCmd = cmd
             elif self.__curTool == self.Rubber:
                 cmd = IconEditCommand(self, self.__undoTexts[self.__curTool],
                                       self.__image)
-                self.__setImagePixel(evt.pos(), False)
+                self.__setImagePixel(evt.position().toPoint(), False)
                 self.setDirty(True)
                 self.__undoStack.push(cmd)
                 self.__currentUndoCmd = cmd
             elif self.__curTool == self.Fill:
-                i, j = self.__imageCoordinates(evt.pos())
+                i, j = self.__imageCoordinates(evt.position().toPoint())
                 col = QColor()
                 col.setRgba(self.__image.pixel(i, j))
                 cmd = IconEditCommand(self, self.__undoTexts[self.__curTool],
@@ -508,14 +507,14 @@
                 self.__undoStack.push(cmd)
                 cmd.setAfterImage(self.__image)
             elif self.__curTool == self.ColorPicker:
-                i, j = self.__imageCoordinates(evt.pos())
+                i, j = self.__imageCoordinates(evt.position().toPoint())
                 col = QColor()
                 col.setRgba(self.__image.pixel(i, j))
                 self.setPenColor(col)
             else:
                 self.__unMark()
-                self.__startPos = evt.pos()
-                self.__endPos = evt.pos()
+                self.__startPos = evt.position().toPoint()
+                self.__endPos = evt.position().toPoint()

     def mouseMoveEvent(self, evt):
         """
@@ -523,26 +522,26 @@

         @param evt reference to the mouse event object (QMouseEvent)
         """
-        self.positionChanged.emit(*self.__imageCoordinates(evt.pos()))
+        self.positionChanged.emit(*self.__imageCoordinates(evt.position().toPoint()))

         if (
             self.__isPasting and
             not (evt.buttons() & Qt.MouseButton.LeftButton)
         ):
-            self.__drawPasteRect(evt.pos())
+            self.__drawPasteRect(evt.position().toPoint())
             return

         if evt.buttons() & Qt.MouseButton.LeftButton:
             if self.__curTool == self.Pencil:
-                self.__setImagePixel(evt.pos(), True)
+                self.__setImagePixel(evt.position().toPoint(), True)
                 self.setDirty(True)
             elif self.__curTool == self.Rubber:
-                self.__setImagePixel(evt.pos(), False)
+                self.__setImagePixel(evt.position().toPoint(), False)
                 self.setDirty(True)
             elif self.__curTool in [self.Fill, self.ColorPicker]:
                 pass    # do nothing
             else:
-                self.__drawTool(evt.pos(), True)
+                self.__drawTool(evt.position().toPoint(), True)

     def mouseReleaseEvent(self, evt):
         """
@@ -564,7 +563,7 @@
                                       self.CircleSelection]:
                 cmd = IconEditCommand(self, self.__undoTexts[self.__curTool],
                                       self.__image)
-                if self.__drawTool(evt.pos(), False):
+                if self.__drawTool(evt.position().toPoint(), False):
                     self.__undoStack.push(cmd)
                     cmd.setAfterImage(self.__image)
                     self.setDirty(True)
--- a/eric7/IconEditor/IconEditorPalette.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/IconEditor/IconEditorPalette.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a palette widget for the icon editor.
 """

-from PyQt5.QtCore import pyqtSignal, Qt
-from PyQt5.QtGui import QColor, QPainter, QPixmap
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtGui import QColor, QPainter, QPixmap
+from PyQt6.QtWidgets import (
     QWidget, QBoxLayout, QLabel, QFrame, QPushButton, QSpinBox, QGroupBox,
     QVBoxLayout, QRadioButton, QSpacerItem, QSizePolicy, QColorDialog
 )
--- a/eric7/IconEditor/IconEditorWindow.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/IconEditor/IconEditorWindow.py	Sun May 16 20:07:24 2021 +0200
@@ -10,13 +10,13 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, QEvent
 )
-from PyQt5.QtGui import (
+from PyQt6.QtGui import (
     QPalette, QImage, QImageReader, QImageWriter, QKeySequence
 )
-from PyQt5.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis
+from PyQt6.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis

 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5FileDialog, E5MessageBox
@@ -996,11 +996,9 @@
         self.__paletteDock = QDockWidget(self)
         self.__paletteDock.setObjectName("paletteDock")
         self.__paletteDock.setFeatures(
-            QDockWidget.DockWidgetFeatures(
-                QDockWidget.DockWidgetFeature.DockWidgetClosable |
-                QDockWidget.DockWidgetFeature.DockWidgetMovable |
-                QDockWidget.DockWidgetFeature.DockWidgetFloatable
-            )
+            QDockWidget.DockWidgetFeature.DockWidgetClosable |
+            QDockWidget.DockWidgetFeature.DockWidgetMovable |
+            QDockWidget.DockWidgetFeature.DockWidgetFloatable
         )
         self.__paletteDock.setWindowTitle("Palette")
         self.__palette = IconEditorPalette()
--- a/eric7/IconEditor/IconSizeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/IconEditor/IconSizeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the icon size.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_IconSizeDialog import Ui_IconSizeDialog
--- a/eric7/MicroPython/AddEditDevicesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/AddEditDevicesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,9 +8,9 @@
 devices.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_AddEditDevicesDialog import Ui_AddEditDevicesDialog
--- a/eric7/MicroPython/CircuitPythonDevices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/CircuitPythonDevices.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import shutil
 import os

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/MicroPython/ConnectionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/ConnectionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 the attached device.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_ConnectionSelectionDialog import Ui_ConnectionSelectionDialog
--- a/eric7/MicroPython/EspBackupRestoreFirmwareDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/EspBackupRestoreFirmwareDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/MicroPython/EspDevices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/EspDevices.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import sys

-from PyQt5.QtCore import pyqtSlot, QProcess
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QProcess
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
 from E5Gui.E5ProcessDialog import E5ProcessDialog
--- a/eric7/MicroPython/EspFirmwareSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/EspFirmwareSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/MicroPython/IgnoredDevicesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/IgnoredDevicesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the list of ignored serial devices.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_IgnoredDevicesDialog import Ui_IgnoredDevicesDialog
--- a/eric7/MicroPython/MicroPythonCommandsInterface.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonCommandsInterface.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import time
 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, QObject, QThread, QTimer, QCoreApplication,
     QEventLoop
 )
--- a/eric7/MicroPython/MicroPythonDevices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonDevices.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import logging
 import os

-from PyQt5.QtCore import pyqtSlot, QObject, QCoreApplication
-from PyQt5.QtWidgets import QInputDialog
+from PyQt6.QtCore import pyqtSlot, QObject, QCoreApplication
+from PyQt6.QtWidgets import QInputDialog

 from E5Gui.E5Application import e5App

@@ -189,7 +189,7 @@
         list of tuples of (int, int, str),
         list of tuples of (int, int, str, str)
     """
-    from PyQt5.QtSerialPort import QSerialPortInfo
+    from PyQt6.QtSerialPort import QSerialPortInfo

     foundDevices = []
     unknownDevices = []
--- a/eric7/MicroPython/MicroPythonFileManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonFileManager.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import stat
 import shutil

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject

 from .MicroPythonFileSystemUtilities import (
     mtime2string, mode2string, decoratedName, listdirStat
--- a/eric7/MicroPython/MicroPythonFileManagerWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonFileManagerWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import shutil

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import (
     QWidget, QTreeWidgetItem, QHeaderView, QMenu, QInputDialog, QLineEdit,
     QDialog
 )
--- a/eric7/MicroPython/MicroPythonGraphWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonGraphWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -14,13 +14,13 @@
 import csv
 import contextlib

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt
-from PyQt5.QtGui import QPainter
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtGui import QPainter
+from PyQt6.QtWidgets import (
     QWidget, QHBoxLayout, QVBoxLayout, QToolButton, QSizePolicy, QSpacerItem,
     QLabel, QSpinBox
 )
-from PyQt5.QtChart import QChartView, QChart, QLineSeries, QValueAxis
+from PyQt6.QtChart import QChartView, QChart, QLineSeries, QValueAxis

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/MicroPython/MicroPythonProgressInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonProgressInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show progress messages.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QDialog

 from .Ui_MicroPythonProgressInfoDialog import Ui_MicroPythonProgressInfoDialog
--- a/eric7/MicroPython/MicroPythonSerialPort.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonSerialPort.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 MicroPython devices.
 """

-from PyQt5.QtCore import QIODevice, QTime, QCoreApplication, QEventLoop
-from PyQt5.QtSerialPort import QSerialPort
+from PyQt6.QtCore import QIODevice, QTime, QCoreApplication, QEventLoop
+from PyQt6.QtSerialPort import QSerialPort


 class MicroPythonSerialPort(QSerialPort):
@@ -106,8 +106,7 @@
         data = bytearray()
         self.__timedOut = False

-        t = QTime()
-        t.start()
+        t = QTime.currentTime()
         while True:
             QCoreApplication.processEvents(
                 QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
@@ -118,7 +117,7 @@
                     break
                 if size is not None and len(data) >= size:
                     break
-            if t.elapsed() > self.__timeout:
+            if t.msecsTo(QTime.currentTime()) > self.__timeout:
                 self.__timedOut = True
                 break
--- a/eric7/MicroPython/MicroPythonWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicroPythonWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import os
 import functools

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QPoint, QEvent
-from PyQt5.QtGui import QColor, QKeySequence, QTextCursor, QBrush, QClipboard
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QPoint, QEvent
+from PyQt6.QtGui import QColor, QKeySequence, QTextCursor, QBrush, QClipboard
+from PyQt6.QtWidgets import (
     QWidget, QMenu, QApplication, QHBoxLayout, QSpacerItem, QSizePolicy,
     QTextEdit, QToolButton, QDialog
 )
@@ -776,7 +776,7 @@

         # set the font
         charFormat = tc.charFormat()
-        charFormat.setFontFamily(self.__font.family())
+        charFormat.setFontFamilies([self.__font.family()])
         charFormat.setFontPointSize(self.__font.pointSize())
         tc.setCharFormat(charFormat)
--- a/eric7/MicroPython/MicrobitDevices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/MicrobitDevices.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import shutil

-from PyQt5.QtCore import pyqtSlot, QStandardPaths
-from PyQt5.QtWidgets import QInputDialog, QLineEdit
+from PyQt6.QtCore import pyqtSlot, QStandardPaths
+from PyQt6.QtWidgets import QInputDialog, QLineEdit

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART
--- a/eric7/MicroPython/PyBoardDevices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/PyBoardDevices.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QStandardPaths
+from PyQt6.QtCore import pyqtSlot, QStandardPaths

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
--- a/eric7/MicroPython/RP2040Devices.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/RP2040Devices.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 (e.g. Raspberry Pi Pico).
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART
--- a/eric7/MicroPython/UF2FlashDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/UF2FlashDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QThread, QEventLoop
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QThread, QEventLoop
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes

@@ -453,7 +453,7 @@
         VID and PID
     @rtype list of tuple of (str, str, int, int)
     """
-    from PyQt5.QtSerialPort import QSerialPortInfo
+    from PyQt6.QtSerialPort import QSerialPortInfo

     foundDevices = []
--- a/eric7/MicroPython/UnknownDevicesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MicroPython/UnknownDevicesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to manage the list of unknown devices.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialog, QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/MultiProject/AddProjectDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MultiProject/AddProjectDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes

@@ -85,7 +85,7 @@
         """
         if not self.uid:
             # new project entry
-            from PyQt5.QtCore import QUuid
+            from PyQt6.QtCore import QUuid
             self.uid = QUuid.createUuid().toString()

         filename = self.filenamePicker.text()
--- a/eric7/MultiProject/MultiProject.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MultiProject/MultiProject.py	Sun May 16 20:07:24 2021 +0200
@@ -11,10 +11,10 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QFileInfo, QFile, QIODevice, QObject, QUuid
 )
-from PyQt5.QtWidgets import QMenu, QApplication, QDialog, QToolBar
+from PyQt6.QtWidgets import QMenu, QApplication, QDialog, QToolBar

 from Globals import recentNameMultiProject
--- a/eric7/MultiProject/MultiProjectBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MultiProject/MultiProjectBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import glob

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QDialog, QMenu
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QDialog, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/MultiProject/MultiProjectFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MultiProject/MultiProjectFile.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 import time
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/MultiProject/PropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/MultiProject/PropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the multi project properties dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_PropertiesDialog import Ui_PropertiesDialog
--- a/eric7/Network/IRC/IrcChannelEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcChannelEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit channel data.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_IrcChannelEditDialog import Ui_IrcChannelEditDialog
--- a/eric7/Network/IRC/IrcChannelWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcChannelWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -11,12 +11,12 @@

 import re

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, QTimer, QUrl,
     QCoreApplication
 )
-from PyQt5.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices
+from PyQt6.QtWidgets import (
     QWidget, QListWidgetItem, QMenu, QApplication, QInputDialog, QLineEdit
 )
--- a/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QItemSelectionModel
-from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit
+from PyQt6.QtCore import pyqtSlot, Qt, QEvent, QItemSelectionModel
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

 from E5Gui import E5MessageBox
--- a/eric7/Network/IRC/IrcMessageEdit.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcMessageEdit.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a specialized line edit for entering IRC messages.
 """

-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt

 from E5Gui.E5LineEdit import E5LineEditSide, E5ClearableLineEdit
--- a/eric7/Network/IRC/IrcNetworkEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcNetworkEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/Network/IRC/IrcNetworkListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcNetworkListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to list the configured IRC networks.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/Network/IRC/IrcNetworkManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcNetworkManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import copy

-from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication
+from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication

 import Utilities
 from Utilities.AutoSaver import AutoSaver
--- a/eric7/Network/IRC/IrcNetworkWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcNetworkWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the network part of the IRC widget.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl, QThread
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QWidget, QApplication, QMenu
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl, QThread
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QWidget, QApplication, QMenu

 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Network/IRC/IrcServerEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcServerEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for editing the IRC server configuration.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_IrcServerEditDialog import Ui_IrcServerEditDialog
--- a/eric7/Network/IRC/IrcUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import QTime, QCoreApplication
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtCore import QTime, QCoreApplication
+from PyQt6.QtWidgets import QApplication

 import Utilities
 import Preferences
--- a/eric7/Network/IRC/IrcWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Network/IRC/IrcWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -10,13 +10,13 @@
 import re
 import logging

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer, QDateTime
 )
-from PyQt5.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget
-from PyQt5.QtNetwork import QTcpSocket, QAbstractSocket
+from PyQt6.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget
+from PyQt6.QtNetwork import QTcpSocket, QAbstractSocket
 try:
-    from PyQt5.QtNetwork import QSslSocket, QSslConfiguration
+    from PyQt6.QtNetwork import QSslSocket, QSslConfiguration
     from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState
     SSL_AVAILABLE = True
 except ImportError:
--- a/eric7/PipInterface/Pip.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/Pip.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import json
 import contextlib

-from PyQt5.QtCore import pyqtSlot, QObject, QProcess, QUrl, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import pyqtSlot, QObject, QProcess, QUrl, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
--- a/eric7/PipInterface/PipDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a dialog showing the output of a pip command.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QCoreApplication, QTimer, QProcess
 )
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton

 from E5Gui import E5MessageBox
--- a/eric7/PipInterface/PipFileSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipFileSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/PipInterface/PipFreezeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipFreezeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractButton, QApplication
 )
--- a/eric7/PipInterface/PipPackageDetailsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipPackageDetailsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show details about a package.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QLocale
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QLocale
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QTreeWidgetItem, QLabel, QHeaderView,
     QAbstractButton
 )
--- a/eric7/PipInterface/PipPackagesInputDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipPackagesInputDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter package specifications.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_PipPackagesInputDialog import Ui_PipPackagesInputDialog
--- a/eric7/PipInterface/PipPackagesWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PipInterface/PipPackagesWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import html.parser
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
-from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt6.QtWidgets import (
     QWidget, QToolButton, QApplication, QHeaderView, QTreeWidgetItem,
     QMenu, QDialog
 )
--- a/eric7/PluginManager/PluginDetailsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginDetailsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Plugin Details Dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_PluginDetailsDialog import Ui_PluginDetailsDialog
--- a/eric7/PluginManager/PluginExceptions.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginExceptions.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the exceptions raised by the plugin system.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication


 class PluginError(Exception):
--- a/eric7/PluginManager/PluginInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the Plugin Info Dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtGui import QBrush
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView, QMenu
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtGui import QBrush
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView, QMenu

 from .Ui_PluginInfoDialog import Ui_PluginInfoDialog
--- a/eric7/PluginManager/PluginInstallDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginInstallDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -16,8 +16,8 @@
 import contextlib
 import urllib.parse

-from PyQt5.QtCore import pyqtSlot, Qt, QDir, QFileInfo
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QDir, QFileInfo
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QAbstractButton, QApplication, QDialog,
     QVBoxLayout
 )
--- a/eric7/PluginManager/PluginManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginManager.py	Sun May 16 20:07:24 2021 +0200
@@ -14,11 +14,11 @@
 import importlib
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QDate, QFile, QFileInfo, QUrl, QIODevice
 )
-from PyQt5.QtGui import QPixmap
-from PyQt5.QtNetwork import (
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )

@@ -1257,7 +1257,7 @@
         self.__updateAvailable = False

         request = QNetworkRequest(
-            QUrl(Preferences.getUI("PluginRepositoryUrl6")))
+            QUrl(Preferences.getUI("PluginRepositoryUrl7")))
         request.setAttribute(
             QNetworkRequest.Attribute.CacheLoadControlAttribute,
             QNetworkRequest.CacheLoadControl.AlwaysNetwork)
@@ -1283,7 +1283,7 @@
                 self.tr(
                     """<p>Could not download the requested file"""
                     """ from {0}.</p><p>Error: {1}</p>"""
-                ).format(Preferences.getUI("PluginRepositoryUrl6"),
+                ).format(Preferences.getUI("PluginRepositoryUrl7"),
                          reply.errorString())
             )
             reply.deleteLater()
@@ -1302,13 +1302,13 @@
             f = QFile(self.pluginRepositoryFile)
             if f.open(QIODevice.OpenModeFlag.ReadOnly):
                 # save current URL
-                url = Preferences.getUI("PluginRepositoryUrl6")
+                url = Preferences.getUI("PluginRepositoryUrl7")

                 # read the repository file
                 from E5XML.PluginRepositoryReader import PluginRepositoryReader
                 reader = PluginRepositoryReader(f, self.checkPluginEntry)
                 reader.readXML()
-                if url != Preferences.getUI("PluginRepositoryUrl6"):
+                if url != Preferences.getUI("PluginRepositoryUrl7"):
                     # redo if it is a redirect
                     self.checkPluginUpdatesAvailable()
                     return
--- a/eric7/PluginManager/PluginRepositoryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginRepositoryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -13,15 +13,15 @@
 import glob
 import re

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, QProcess, QPoint,
     QCoreApplication
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QAbstractButton, QTreeWidgetItem, QDialog,
     QVBoxLayout, QMenu
 )
-from PyQt5.QtNetwork import (
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )

@@ -109,7 +109,7 @@
         self.__closeButton.setEnabled(True)

         self.repositoryUrlEdit.setText(
-            Preferences.getUI("PluginRepositoryUrl6"))
+            Preferences.getUI("PluginRepositoryUrl7"))

         self.repositoryList.headerItem().setText(
             self.repositoryList.columnCount(), "")
@@ -399,7 +399,7 @@
                 self.repositoryList.resizeColumnToContents(1)
                 self.repositoryList.resizeColumnToContents(2)
                 self.__resortRepositoryList()
-                url = Preferences.getUI("PluginRepositoryUrl6")
+                url = Preferences.getUI("PluginRepositoryUrl7")
                 if url != self.repositoryUrlEdit.text():
                     self.repositoryUrlEdit.setText(url)
                     E5MessageBox.warning(
--- a/eric7/PluginManager/PluginUninstallDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PluginManager/PluginUninstallDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -13,8 +13,8 @@
 import shutil
 import glob

-from PyQt5.QtCore import pyqtSlot, pyqtSignal
-from PyQt5.QtWidgets import QWidget, QDialog, QDialogButtonBox, QVBoxLayout
+from PyQt6.QtCore import pyqtSlot, pyqtSignal
+from PyQt6.QtWidgets import QWidget, QDialog, QDialogButtonBox, QVBoxLayout

 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
--- a/eric7/Plugins/AboutPlugin/AboutDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/AboutPlugin/AboutDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing an 'About Eric' dialog.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from .Ui_AboutDialog import Ui_AboutDialog
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (code annotations part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _annotationsMessages = {
     "A001": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 be ignored.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_CodeStyleAddBuiltinIgnoreDialog import (
     Ui_CodeStyleAddBuiltinIgnoreDialog
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -13,9 +13,9 @@
 import collections
 import json

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
-from PyQt5.QtGui import QIcon
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
+from PyQt6.QtGui import QIcon
+from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QAbstractButton, QDialogButtonBox, QApplication,
     QHeaderView, QListWidgetItem, QInputDialog, QLineEdit
 )
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import textwrap

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import textwrap

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .translations import getTranslatedMessage
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (code complexity part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _complexityMessages = {
     "C101": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (code documentation part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _docStyleMessages = {
     "D101": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (miscellaneous part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _miscellaneousMessages = {
     "M101": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (naming part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _namingStyleMessages = {
     "N801": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (pathlib part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _pathlibMessages = {
     "P101": QCoreApplication.translate(
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (security part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _securityMessages = {
     # assert used
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 (simplify part).
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 _simplifyMessages = {
     # Python-specifics
--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import re
 import contextlib

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 from .Annotations.translations import (
     _annotationsMessages, _annotationsMessagesSampleArgs
--- a/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 check.
 """

-from PyQt5.QtCore import QObject, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSignal

 from E5Gui.E5Application import e5App
 from Utilities import determinePythonVersion
--- a/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import fnmatch

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QTreeWidgetItem, QApplication, QHeaderView
 )
--- a/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 """


-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 __all__ = ["getTranslatedFlakesMessage"]
--- a/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import copy

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import QProcess, QTimer
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QProcess, QTimer
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,9 +11,9 @@
 import os
 import copy

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QColorDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QColorDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import QProcess, QTimer
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QProcess, QTimer
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/PluginAbout.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginAbout.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the About plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QAction
+from PyQt6.QtCore import QObject
+from PyQt6.QtGui import QAction

 import UI.Info
 import UI.PixmapCache
--- a/eric7/Plugins/PluginCodeStyleChecker.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginCodeStyleChecker.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import textwrap
 import contextlib

-from PyQt5.QtCore import QObject, pyqtSignal, QCoreApplication
+from PyQt6.QtCore import QObject, pyqtSignal, QCoreApplication

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginEricapi.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginEricapi.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QObject, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginEricdoc.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginEricdoc.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QObject, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginSyntaxChecker.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginSyntaxChecker.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui.E5Action import E5Action
 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginTranslator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginTranslator.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication, QDateTime, Qt
+from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication, QDateTime, Qt

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginVcsGit.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVcsGit.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QObject, QCoreApplication, QByteArray
+from PyQt6.QtCore import QObject, QCoreApplication, QByteArray

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginVcsMercurial.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVcsMercurial.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QObject, QCoreApplication, QByteArray
+from PyQt6.QtCore import QObject, QCoreApplication, QByteArray

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginVcsPySvn.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVcsPySvn.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QObject, QCoreApplication

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginVcsSubversion.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVcsSubversion.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QObject, QCoreApplication

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/PluginVmListspace.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVmListspace.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QT_TRANSLATE_NOOP, QObject
-from PyQt5.QtGui import QPixmap
+from PyQt6.QtCore import QT_TRANSLATE_NOOP, QObject
+from PyQt6.QtGui import QPixmap

 import UI.Info
--- a/eric7/Plugins/PluginVmTabview.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginVmTabview.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QT_TRANSLATE_NOOP, QObject
-from PyQt5.QtGui import QPixmap
+from PyQt6.QtCore import QT_TRANSLATE_NOOP, QObject
+from PyQt6.QtGui import QPixmap

 import UI.Info
--- a/eric7/Plugins/PluginWizardDotDesktop.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardDotDesktop.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the .desktop wizard plug-in.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardE5MessageBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardE5MessageBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the E5MessageBox wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardEricPlugin.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardEricPlugin.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardPyRegExp.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardPyRegExp.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Python re wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQColorDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQColorDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the QColorDialog wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQFileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQFileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQFontDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQFontDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the QFontDialog wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQInputDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQInputDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the QInputDialog wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQMessageBox.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQMessageBox.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the QMessageBox wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardQRegularExpression.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardQRegularExpression.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the QRegularExpression wizard plugin.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/PluginWizardSetup.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/PluginWizardSetup.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the setup.py wizard plug-in.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Time Tracker configuration page.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QListWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import Qt, QObject
-from PyQt5.QtGui import QKeySequence
+from PyQt6.QtCore import Qt, QObject
+from PyQt6.QtGui import QKeySequence

 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QUrl, QByteArray, QTimer

 import Utilities
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QTimer
+from PyQt6.QtCore import QUrl, QTimer

 from .TranslationEngine import TranslationEngine
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import json
 import re

-from PyQt5.QtCore import QByteArray, QUrl, QTimer
+from PyQt6.QtCore import QByteArray, QUrl, QTimer

 import Utilities
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QTimer
+from PyQt6.QtCore import QUrl, QTimer

 from .TranslationEngine import TranslationEngine
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import json

-from PyQt5.QtCore import QUrl, QByteArray, QTimer
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Microsoft translation engine.
 """

-from PyQt5.QtCore import QUrl, QDateTime, QByteArray, QTimer
+from PyQt6.QtCore import QUrl, QDateTime, QByteArray, QTimer

 from .TranslationEngine import TranslationEngine
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QTimer
+from PyQt6.QtCore import QUrl, QTimer

 from .TranslationEngine import TranslationEngine
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/PromtEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/PromtEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QUrl, QByteArray, QTimer

 import Utilities
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSignal, QObject


 class TranslationEngine(QObject):
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import json

-from PyQt5.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QUrl, QByteArray, QTimer

 import Utilities
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtGui import QIcon
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtGui import QIcon

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 import UI.PixmapCache
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 requests.
 """

-from PyQt5.QtCore import QObject, QEventLoop, QByteArray
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import QObject, QEventLoop, QByteArray
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )
--- a/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the translator widget.
 """

-from PyQt5.QtCore import pyqtSlot, QTemporaryFile
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, QTemporaryFile
+from PyQt6.QtWidgets import QWidget
 try:
-    from PyQt5.QtMultimedia import QMediaPlayer, QMediaContent
+    from PyQt6.QtMultimedia import QMediaPlayer, QMediaContent
     MULTIMEDIA_AVAILABLE = True
 except ImportError:
     MULTIMEDIA_AVAILABLE = False
--- a/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data of a remote repository.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitAddRemoteDialog import Ui_GitAddRemoteDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for applying a bundle.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitApplyBundleDataDialog import Ui_GitApplyBundleDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
     QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for an extended bisect start.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitBisectStartDialog import Ui_GitBisectStartDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import re

-from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QLineEdit, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a branching operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitBranchDialog import Ui_GitBranchDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select the data for pushing a branch.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitBranchPushDialog import Ui_GitBranchPushDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitBundleDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitBundleDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a bundle operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitBundleDialog import Ui_GitBundleDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to change the URL of a remote git repository.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitChangeRemoteUrlDialog import Ui_GitChangeRemoteUrlDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter cherry-pick data.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitCherryPickDialog import Ui_GitCherryPickDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Git command dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitCommandDialog import Ui_GitCommandDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from .Ui_GitCommitDialog import Ui_GitCommitDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment
 )
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QFileInfo, Qt
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -44,8 +44,8 @@
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="tabStopWidth">
-          <number>8</number>
+         <property name="tabStopDistance">
+          <double>8.000000000000000</double>
          </property>
         </widget>
         <widget class="QPlainTextEdit" name="contents2">
@@ -58,8 +58,8 @@
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="tabStopWidth">
-          <number>8</number>
+         <property name="tabStopDistance">
+          <double>8.000000000000000</double>
          </property>
         </widget>
        </widget>
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal, QProcess, QTimer, QObject
+from PyQt6.QtCore import pyqtSignal, QProcess, QTimer, QObject

 from E5Gui.E5OverrideCursor import E5OverrideCursorProcess
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a syntax highlighter for diff outputs.
 """

-from PyQt5.QtGui import QColor
+from PyQt6.QtGui import QColor

 from E5Gui.E5GenericDiffHighlighter import TERMINAL, E5GenericDiffHighlighter
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for a Fetch operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitFetchDialog import Ui_GitFetchDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select from a list.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitListDialog import Ui_GitListDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,13 +12,13 @@
 import re
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QDate, QProcess, QTimer, QSize, QPoint, QFileInfo
 )
-from PyQt5.QtGui import (
+from PyQt6.QtGui import (
     QColor, QPixmap, QPainter, QPen, QIcon, QTextCursor, QPalette
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
     QLineEdit, QMenu, QInputDialog
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -479,8 +479,8 @@
            <property name="readOnly">
             <bool>true</bool>
            </property>
-           <property name="tabStopWidth">
-            <number>8</number>
+           <property name="tabStopDistance">
+            <double>8.000000000000000</double>
            </property>
           </widget>
          </item>
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the merge data.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitMergeDialog import Ui_GitMergeDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 repository.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 the VCS.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitOptionsDialog import Ui_GitOptionsDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select a list of patch files.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import Qt, QProcess
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import Qt, QProcess
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for a Pull operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitPullDialog import Ui_GitPullDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for a Push operation.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QComboBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QComboBox

 from .Ui_GitPushDialog import Ui_GitPushDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
     QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data of a remote repository.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitRemoteCredentialsDialog import Ui_GitRemoteCredentialsDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QTreeWidgetItem, QDialogButtonBox, QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select a revision.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitRevisionSelectionDialog import Ui_GitRevisionSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the git diff command.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitRevisionsSelectionDialog import Ui_GitRevisionsSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QTreeWidgetItem, QAbstractButton, QMenu,
     QHeaderView, QApplication, QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a stash operation.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitStashDataDialog import Ui_GitStashDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import tempfile
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, QLineEdit,
     QInputDialog
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -173,8 +173,8 @@
           <property name="readOnly">
            <bool>true</bool>
           </property>
-          <property name="tabStopWidth">
-           <number>8</number>
+          <property name="tabStopDistance">
+           <double>8.000000000000000</double>
           </property>
          </widget>
         </item>
@@ -224,8 +224,8 @@
           <property name="readOnly">
            <bool>true</bool>
           </property>
-          <property name="tabStopWidth">
-           <number>8</number>
+          <property name="tabStopDistance">
+           <double>8.000000000000000</double>
           </property>
          </widget>
         </item>
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the VCS status monitor thread class for Git.
 """

-from PyQt5.QtCore import QProcess
+from PyQt6.QtCore import QProcess

 from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data to add a submodule.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to get the data for a submodule deinit operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitSubmodulesDeinitDialog import Ui_GitSubmodulesDeinitDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to list the defined submodules.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView

 from .Ui_GitSubmodulesListDialog import Ui_GitSubmodulesListDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QTreeWidgetItem, QHeaderView, QAbstractButton
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter submodule summary options.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitSubmodulesSummaryOptionsDialog import (
     Ui_GitSubmodulesSummaryOptionsDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter submodule synchronization options.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitSubmodulesSyncDialog import Ui_GitSubmodulesSyncDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter options for a submodule update command.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitSubmodulesUpdateOptionsDialog import (
     Ui_GitSubmodulesUpdateOptionsDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitTagDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitTagDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitTagDialog import Ui_GitTagDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter some user data.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GitUserConfigDataDialog import Ui_GitUserConfigDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsGit/GitUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QProcessEnvironment
+from PyQt6.QtCore import QProcessEnvironment

 import Utilities
--- a/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QMenu, QDialog
+from PyQt6.QtWidgets import QMenu, QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QFileInfo
-from PyQt5.QtWidgets import QMenu, QInputDialog, QToolBar
+from PyQt6.QtCore import QFileInfo
+from PyQt6.QtWidgets import QMenu, QInputDialog, QToolBar

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/git.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import re
 import contextlib

-from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo
-from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit
+from PyQt6.QtCore import QProcess, pyqtSignal, QFileInfo
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select the heads to be closed.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from .Ui_HgCloseHeadSelectionDialog import Ui_HgCloseHeadSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the closehead extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the closehead extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Mercurial configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for signing a revision.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgGpgSignDialog import Ui_HgGpgSignDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the gpg extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the gpg extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the archive data.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a backout operation.
 """

-from PyQt5.QtCore import pyqtSlot, QDateTime
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgBackoutDialog import Ui_HgBackoutDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the bookmark dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgBookmarkDialog import Ui_HgBookmarkDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to get the data to rename a bookmark.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgBookmarkRenameDialog import Ui_HgBookmarkRenameDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show a list of incoming or outgoing bookmarks.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show a list of bookmarks.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, QMenu,
     QInputDialog
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a branch operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgBranchInputDialog import Ui_HgBranchInputDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a bundle operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgBundleDialog import Ui_HgBundleDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import struct
 import io

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QProcess, QObject, QByteArray, QCoreApplication, QThread
 )
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .HgUtilities import prepareProcess, getHgExecutable
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a prompt dialog for the Mercurial command server.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

 from .Ui_HgClientPromptDialog import Ui_HgClientPromptDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Mercurial command dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgCommandDialog import Ui_HgCommandDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QDateTime
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QDateTime
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from .Ui_HgCommitDialog import Ui_HgCommitDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 conflicts.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import (
     QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem,
     QApplication, QWidget
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog starting a process and showing its output.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgDialog import Ui_HgDialog

@@ -222,7 +222,7 @@
         self.resultbox.ensureCursorVisible()
         self.errors.ensureCursorVisible()

-        from PyQt5.QtCore import QEventLoop
+        from PyQt6.QtCore import QEventLoop
         loop = QEventLoop(self)
         self.sendButton.clicked[bool].connect(loop.quit)
         self.input.returnPressed.connect(loop.quit)
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show the output of the hg diff command process.
 """

-from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QFileInfo, Qt
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -47,8 +47,8 @@
         <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="tabStopWidth">
-         <number>8</number>
+        <property name="tabStopDistance">
+         <double>8.000000000000000</double>
         </property>
        </widget>
       </item>
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSignal, QObject

 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QDir
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDir
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtension.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the base class for Mercurial extension interfaces.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 class HgExtension(QObject):
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 interfaces.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QMenu


 class HgExtensionProjectBrowserHelper(QObject):
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the project helper base for Mercurial extension interfaces.
 """

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QMenu


 class HgExtensionProjectHelper(QObject):
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a graft session.
 """

-from PyQt5.QtCore import pyqtSlot, QDateTime
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgGraftDialog import Ui_HgGraftDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for the Mercurial import command.
 """

-from PyQt5.QtCore import pyqtSlot, QDateTime
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,11 +12,11 @@
 import collections
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QDate, QSize, QPoint, QFileInfo
-from PyQt5.QtGui import (
+from PyQt6.QtCore import pyqtSlot, Qt, QDate, QSize, QPoint, QFileInfo
+from PyQt6.QtGui import (
     QColor, QPixmap, QPainter, QPen, QBrush, QIcon, QTextCursor, QPalette
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
     QLineEdit, QMenu, QInputDialog
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -494,8 +494,8 @@
            <property name="readOnly">
             <bool>true</bool>
            </property>
-           <property name="tabStopWidth">
-            <number>8</number>
+           <property name="tabStopDistance">
+            <double>8.000000000000000</double>
            </property>
           </widget>
          </item>
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgMergeDialog import Ui_HgMergeDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 repository.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 the VCS.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_HgOptionsDialog import Ui_HgOptionsDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for the Mercurial Phase operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgPhaseDialog import Ui_HgPhaseDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to remove sub-repositories.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_HgRemoveSubrepositoriesDialog import Ui_HgRemoveSubrepositoriesDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 of a repository configuration file (hgrc).
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QLineEdit
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QLineEdit

 from .Ui_HgRepoConfigDataDialog import Ui_HgRepoConfigDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select a revision.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgRevisionSelectionDialog import Ui_HgRevisionSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the hg diff command.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgRevisionsSelectionDialog import Ui_HgRevisionsSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import os

-from PyQt5.QtCore import QProcess, Qt, QSize
-from PyQt5.QtGui import QTextCursor, QBrush
-from PyQt5.QtWidgets import (
-    QAction, QToolBar, QPlainTextEdit, QSpinBox, QComboBox
+from PyQt6.QtCore import QProcess, Qt, QSize
+from PyQt6.QtGui import QAction, QTextCursor, QBrush
+from PyQt6.QtWidgets import (
+    QToolBar, QPlainTextEdit, QSpinBox, QComboBox
 )

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QSize
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QSize
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -137,8 +137,8 @@
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="tabStopWidth">
-          <number>8</number>
+         <property name="tabStopDistance">
+          <double>8.000000000000000</double>
          </property>
         </widget>
        </item>
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 directory state.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgSummaryDialog import Ui_HgSummaryDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QMenu,
     QAbstractItemView
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgTagDialog import Ui_HgTagDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 from configparser import ConfigParser
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QEvent
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QEvent
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from E5Gui.E5PathPicker import E5PathPickerModes
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit a host fingerprint.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgUserConfigHostFingerprintDialog import (
     Ui_HgUserConfigHostFingerprintDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the minimum protocol for a host.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgUserConfigHostMinimumProtocolDialog import (
     Ui_HgUserConfigHostMinimumProtocolDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import re
 import sys

-from PyQt5.QtCore import QProcess, QProcessEnvironment, QCoreApplication
+from PyQt6.QtCore import QProcess, QProcessEnvironment, QCoreApplication

 import Utilities
 from Globals import isWindowsPlatform
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit the commit message of a revision.
 """

-from PyQt5.QtCore import pyqtSlot, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the histedit parameters.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup

 from .Ui_HgHisteditConfigDialog import Ui_HgHisteditConfigDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Sun May 16 20:07:24 2021 +0200
@@ -25,7 +25,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit the history modification plan.
 """

-from PyQt5.QtCore import pyqtSlot, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QComboBox
+from PyQt6.QtCore import pyqtSlot, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QComboBox

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the histedit extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import sys

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter a series of revisions.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_LfRevisionsInputDialog import Ui_LfRevisionsInputDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the largefiles extension project browser helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the shelve extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QTimer
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QTimer
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QMenu, QDialog
+from PyQt6.QtWidgets import QMenu, QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QMenu, QToolBar
+from PyQt6.QtWidgets import QMenu, QToolBar

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to list all files not tracked by Mercurial.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_HgPurgeListDialog import Ui_HgPurgeListDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the purge extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the purge extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to define guards for patches.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data to fold patches.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from .Ui_HgQueuesFoldDialog import Ui_HgQueuesFoldDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select a list of guards.
 """

-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QListWidgetItem, QAbstractItemView
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the commit message of the current patch.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgQueuesHeaderDialog import Ui_HgQueuesHeaderDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show all guards for all patches.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show a list of applied and unapplied patches.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the guards of a selected patch.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to get the data for a new patch.
 """

-from PyQt5.QtCore import pyqtSlot, QDateTime
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgQueuesNewPatchDialog import Ui_HgQueuesNewPatchDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog used by the queue management functions.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem,
     QAbstractButton
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data to rename a patch.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgQueuesRenamePatchDialog import Ui_HgQueuesRenamePatchDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the queues extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the queues extension interface.
 """

-from PyQt5.QtWidgets import QDialog, QApplication, QInputDialog
+from PyQt6.QtWidgets import QDialog, QApplication, QInputDialog

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a rebase session.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup

 from .Ui_HgRebaseDialog import Ui_HgRebaseDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the rebase extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the rebase extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing Mercurial shelve browser dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QTreeWidgetItem, QAbstractButton, QMenu,
     QHeaderView, QApplication
 )
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a shelve operation.
 """

-from PyQt5.QtCore import QDateTime
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QDateTime
+from PyQt6.QtWidgets import QDialog

 from .Ui_HgShelveDataDialog import Ui_HgShelveDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select multiple shelve names.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgShelvesSelectionDialog import Ui_HgShelvesSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for an unshelve operation.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_HgUnshelveDataDialog import Ui_HgUnshelveDataDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the shelve extension project browser helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the shelve extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the shelve extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data to strip changesets.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgStripDialog import Ui_HgStripDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the strip extension project helper.
 """

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the strip extension interface.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from ..HgExtension import HgExtension
 from ..HgDialog import HgDialog
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun May 16 20:07:24 2021 +0200
@@ -11,10 +11,10 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
 )
-from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Subversion configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@

 import pysvn

-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QToolBar
+from PyQt6.QtWidgets import QToolBar

 from VCS.ProjectHelper import VcsProjectHelper
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@

 import pysvn

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
     QHeaderView, QDialog, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@

 import pysvn

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Subversion command dialog.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import pysvn

-from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing some constants for the pysvn package.
 """

-from PyQt5.QtCore import QT_TRANSLATE_NOOP
+from PyQt6.QtCore import QT_TRANSLATE_NOOP

 import pysvn
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import pysvn

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QApplication, QDialogButtonBox
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QApplication, QDialogButtonBox

 from .SvnConst import svnNotifyActionMap
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 the pysvn client.
 """

-from PyQt5.QtWidgets import QApplication, QDialog, QWidget
+from PyQt6.QtWidgets import QApplication, QDialog, QWidget

 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@

 import pysvn

-from PyQt5.QtCore import QFileInfo, QDateTime, Qt, pyqtSlot
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import QFileInfo, QDateTime, Qt, pyqtSlot
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -47,8 +47,8 @@
         <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="tabStopWidth">
-         <number>8</number>
+        <property name="tabStopDistance">
+         <double>8.000000000000000</double>
         </property>
        </widget>
       </item>
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import pysvn

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QApplication
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QApplication

 from E5Utilities.E5MutexLocker import E5MutexLocker
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import pysvn

-from PyQt5.QtCore import Qt, QDate, pyqtSlot, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, QDate, pyqtSlot, QPoint
+from PyQt6.QtWidgets import (
     QHeaderView, QWidget, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the login dialog for pysvn.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnLoginDialog import Ui_SvnLoginDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import QDir, pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QDir, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import QDir, pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QDir, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_SvnPropDelDialog import Ui_SvnPropDelDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import pysvn

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import pysvn

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import (
     QHeaderView, QDialog, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from PyQt5.QtCore import QDate, QDateTime, Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QDate, QDateTime, Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import pysvn

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QApplication, QMenu, QDialogButtonBox,
     QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import pysvn

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QDialog, QInputDialog, QApplication,
     QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QDateTime, Qt
+from PyQt6.QtCore import QDateTime, Qt

 import Utilities
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sun May 16 20:07:24 2021 +0200
@@ -14,8 +14,8 @@
 from urllib.parse import quote
 import contextlib

-from PyQt5.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
-from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
+from PyQt6.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
+from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Subversion configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 """

 import os
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QToolBar
+from PyQt6.QtWidgets import QToolBar

 from VCS.ProjectHelper import VcsProjectHelper
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QTimer, QProcess, Qt, pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QTimer, QProcess, Qt, pyqtSlot
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QDialog, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QListWidgetItem, QLineEdit
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Subversion command dialog.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot
-from PyQt5.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt6.QtWidgets import QWidget, QDialogButtonBox

 from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os.path

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment
-from PyQt5.QtWidgets import QLineEdit, QDialog, QDialogButtonBox
+from PyQt6.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment
+from PyQt6.QtWidgets import QLineEdit, QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import os

-from PyQt5.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QLineEdit, QDialogButtonBox
+from PyQt6.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QWidget, QLineEdit, QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -47,8 +47,8 @@
         <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="tabStopWidth">
-         <number>8</number>
+        <property name="tabStopDistance">
+         <double>8.000000000000000</double>
         </property>
        </widget>
       </item>
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QDate, QProcess, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QDate, QProcess, QPoint
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QWidget, QApplication, QDialogButtonBox,
     QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import QDir, pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QDir, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import QDir, pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QDir, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import re

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QProcess, QProcessEnvironment
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess, QProcessEnvironment
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a new property.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data to relocate the workspace.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QProcess
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QDialog, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the revisions for the svn diff command.
 """

-from PyQt5.QtCore import QDate, QDateTime, Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QDate, QDateTime, Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import re
 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QProcess
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QLineEdit, QApplication, QMenu, QDialogButtonBox,
     QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.QtCore import QProcess
+from PyQt6.QtCore import QProcess

 from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a switch operation.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QProcess
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QDialog, QInputDialog, QDialogButtonBox,
     QTreeWidgetItem
 )
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a tagging operation.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import shutil
 from urllib.parse import quote

-from PyQt5.QtCore import pyqtSignal, QProcess, QCoreApplication
-from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
+from PyQt6.QtCore import pyqtSignal, QProcess, QCoreApplication
+from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileInfo, QEvent, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFileInfo, QEvent, Qt
+from PyQt6.QtWidgets import (
     QStackedWidget, QSplitter, QListWidget, QListWidgetItem, QSizePolicy,
     QMenu, QApplication
 )
--- a/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Sun May 16 20:07:24 2021 +0200
@@ -9,12 +9,12 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, QMimeData,
     Qt, QSize
 )
-from PyQt5.QtGui import QColor, QDrag, QPixmap, QMouseEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QColor, QDrag, QPixmap, QMouseEvent
+from PyQt6.QtWidgets import (
     QWidget, QHBoxLayout, QSplitter, QTabBar, QApplication, QToolButton,
     QMenu, QLabel
 )
@@ -77,7 +77,7 @@
         @type QMouseEvent
         """
         if event.button() == Qt.MouseButton.LeftButton:
-            self.__dragStartPos = QPoint(event.pos())
+            self.__dragStartPos = QPoint(event.position().toPoint())
         super().mousePressEvent(event)

     def mouseMoveEvent(self, event):
@@ -89,12 +89,12 @@
         """
         if (
             event.buttons() == Qt.MouseButtons(Qt.MouseButton.LeftButton) and
-            (event.pos() - self.__dragStartPos).manhattanLength() >
+            (event.position().toPoint() - self.__dragStartPos).manhattanLength() >
                 QApplication.startDragDistance()
         ):
             drag = QDrag(self)
             mimeData = QMimeData()
-            index = self.tabAt(event.pos())
+            index = self.tabAt(event.position().toPoint())
             mimeData.setText(self.tabText(index))
             mimeData.setData("action", b"tab-reordering")
             mimeData.setData("tabbar-id", str(id(self)).encode("utf-8"))
@@ -144,7 +144,7 @@
         mimeData = event.mimeData()
         oldID = int(mimeData.data("tabbar-id"))
         fromIndex = int(mimeData.data("source-index"))
-        toIndex = self.tabAt(event.pos())
+        toIndex = self.tabAt(event.position().toPoint())
         if oldID != id(self):
             parentID = int(mimeData.data("tabwidget-id"))
             if event.proposedAction() == Qt.DropAction.MoveAction:
@@ -1357,7 +1357,7 @@
                 switched = watched.parent() is not self.currentTabWidget
                 self.currentTabWidget = watched.parent()
                 if switched:
-                    index = self.currentTabWidget.selectTab(event.pos())
+                    index = self.currentTabWidget.selectTab(event.position().toPoint())
                     switched = (
                         self.currentTabWidget.widget(index) is
                         self.activeWindow()
--- a/eric7/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QColorDialog, QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QColorDialog, QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox

@@ -64,7 +64,7 @@
                 else:
                     coStr = "QColor({0})".format(coStr)
                 try:
-                    exec('from PyQt5.QtCore import Qt;'             # secok
+                    exec('from PyQt6.QtCore import Qt;'             # secok
                          ' QColorDialog.getColor({0}, None, "{1}")'.format(
                              coStr, self.eTitle.text()))
                 except Exception:
--- a/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select multiple entries from a list.
 """

-from PyQt5.QtWidgets import QDialog, QListWidgetItem, QAbstractItemView
+from PyQt6.QtWidgets import QDialog, QListWidgetItem, QAbstractItemView

 from .Ui_DotDesktopListSelectionDialog import Ui_DotDesktopListSelectionDialog
--- a/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton

 from E5Gui import E5MessageBox
--- a/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the eric plug-in wizard dialog.
 """

-from PyQt5.QtCore import pyqtSlot, QDate
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QDate
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Application import e5App
--- a/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py	Sun May 16 20:07:24 2021 +0200
@@ -16,7 +16,7 @@
 Module documentation goes here.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 {config0}\
 # Start-Of-Header
@@ -144,7 +144,7 @@
     @return preview pixmap
     @rtype QPixmap
     """
-    from PyQt5.QtGui import QPixmap
+    from PyQt6.QtGui import QPixmap

     fname = "preview.png"
     return QPixmap(fname)
--- a/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QFileDialog, QButtonGroup
 )
--- a/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFontDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QFontDialog

 from .Ui_FontDialogWizardDialog import Ui_FontDialogWizardDialog

@@ -117,7 +117,7 @@
                 code += '{0}{1}'.format(os.linesep, istring)
             if not self.eVariable.text():
                 if self.font is not None:
-                    code += 'QFont("{0}", {1:d}, {2:d}, {3:d})'.format(
+                    code += 'QFont(["{0}"], {1:d}, {2:d}, {3:d})'.format(
                         self.font.family(), self.font.pointSize(),
                         self.font.weight(), self.font.italic())
             else:
--- a/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QDoubleValidator
-from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QDoubleValidator
+from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QDialogButtonBox

 from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog
--- a/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QMessageBox, QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QMessageBox, QDialog, QDialogButtonBox

 from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog
--- a/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog for entering character classes.
 """

-from PyQt5.QtCore import QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, QPushButton,
     QDialog, QScrollArea, QComboBox, QVBoxLayout, QLabel
 )
--- a/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import os
 import re

-from PyQt5.QtCore import QFileInfo, pyqtSlot
-from PyQt5.QtGui import QClipboard, QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QFileInfo, pyqtSlot
+from PyQt6.QtGui import QClipboard, QTextCursor
+from PyQt6.QtWidgets import (
     QWidget, QDialog, QInputDialog, QApplication, QDialogButtonBox,
     QVBoxLayout, QTableWidgetItem
 )
--- a/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_PyRegExpWizardRepeatDialog import Ui_PyRegExpWizardRepeatDialog
--- a/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog for entering character classes.
 """

-from PyQt5.QtCore import QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import (
     QWidget, QDialog, QVBoxLayout, QHBoxLayout, QScrollArea, QPushButton,
     QSpacerItem, QSizePolicy, QComboBox, QLineEdit, QLabel
 )
--- a/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import sys
 import json

-from PyQt5.QtCore import QFileInfo, pyqtSlot, QProcess, QByteArray
-from PyQt5.QtGui import QClipboard, QTextCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QFileInfo, pyqtSlot, QProcess, QByteArray
+from PyQt6.QtGui import QClipboard, QTextCursor
+from PyQt6.QtWidgets import (
     QWidget, QDialog, QInputDialog, QApplication, QDialogButtonBox,
     QVBoxLayout, QTableWidgetItem
 )
--- a/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for entering repeat counts.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_QRegularExpressionWizardRepeatDialog import (
     Ui_QRegularExpressionWizardRepeatDialog
--- a/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py	Sun May 16 20:07:24 2021 +0200
@@ -21,7 +21,7 @@
         string (string) and error offset (integer)
     """
     try:
-        from PyQt5.QtCore import QRegularExpression
+        from PyQt6.QtCore import QRegularExpression
         rxOptions = QRegularExpression.PatternOption.NoPatternOption
         if "CaseInsensitiveOption" in options:
             rxOptions |= QRegularExpression.PatternOption.CaseInsensitiveOption
@@ -78,7 +78,7 @@
     if not valid:
         return valid, error, errorOffset

-    from PyQt5.QtCore import QRegularExpression
+    from PyQt6.QtCore import QRegularExpression
     rxOptions = QRegularExpression.PatternOption.NoPatternOption
     if "CaseInsensitiveOption" in options:
         rxOptions |= QRegularExpression.PatternOption.CaseInsensitiveOption
--- a/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import os
 import datetime

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QTreeWidgetItem, QListWidgetItem
 )
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Preferences/ConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import os
 import types

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QMetaObject, QRect
-from PyQt5.QtGui import QPixmap
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QMetaObject, QRect
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QTreeWidget, QStackedWidget, QDialog,
     QSplitter, QScrollArea, QApplication, QDialogButtonBox, QFrame,
     QVBoxLayout, QTreeWidgetItem, QLabel, QAbstractScrollArea
--- a/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the base class for all configuration pages.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal
-from PyQt5.QtGui import QIcon, QPixmap, QColor
-from PyQt5.QtWidgets import QWidget, QColorDialog, QFontDialog
+from PyQt6.QtCore import pyqtSlot, pyqtSignal
+from PyQt6.QtGui import QIcon, QPixmap, QColor
+from PyQt6.QtWidgets import QWidget, QColorDialog, QFontDialog


 class ConfigurationPageBase(QWidget):
--- a/eric7/Preferences/ConfigurationPages/CooperationPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/CooperationPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Cooperation configuration page.
 """

-from PyQt5.QtCore import pyqtSlot, QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator, QValidator
+from PyQt6.QtCore import pyqtSlot, QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator, QValidator

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_CooperationPage import Ui_CooperationPage
--- a/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import re
 import socket

-from PyQt5.QtCore import pyqtSlot, Qt, QAbstractItemModel, QModelIndex
-from PyQt5.QtGui import QBrush, QColor
-from PyQt5.QtWidgets import QLineEdit, QInputDialog
-from PyQt5.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress
+from PyQt6.QtCore import pyqtSlot, Qt, QAbstractItemModel, QModelIndex
+from PyQt6.QtGui import QBrush, QColor
+from PyQt6.QtWidgets import QLineEdit, QInputDialog
+from PyQt6.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress

 from E5Gui.E5Application import e5App
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Debugger Python3 configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ConfigurationPages/DiffColoursPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/DiffColoursPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the Diff colours configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QPalette
-from PyQt5.QtWidgets import QColorDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QPalette
+from PyQt6.QtWidgets import QColorDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_DiffColoursPage import Ui_DiffColoursPage
--- a/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Editor APIs configuration page.
 """

-from PyQt5.QtCore import QDir, pyqtSlot, QFileInfo
-from PyQt5.QtWidgets import QInputDialog
+from PyQt6.QtCore import QDir, pyqtSlot, QFileInfo
+from PyQt6.QtWidgets import QInputDialog

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the QScintilla Autocompletion configuration page.
 """

-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAutocompletionQScintillaPage import (
--- a/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Editor Calltips configuration page.
 """

-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorCalltipsPage import Ui_EditorCalltipsPage
--- a/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the QScintilla Calltips configuration page.
 """

-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorCalltipsQScintillaPage import Ui_EditorCalltipsQScintillaPage
--- a/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Editor Exporters configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QFontDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QFontDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorExportersPage import Ui_EditorExportersPage
--- a/eric7/Preferences/ConfigurationPages/EditorFilePage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorFilePage.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import sys

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QListWidgetItem, QInputDialog, QLineEdit
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QListWidgetItem, QInputDialog, QLineEdit
+from PyQt6.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the Editor General configuration page.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QTreeWidgetItem, QHeaderView, QDialog
-from PyQt5.Qsci import QsciScintillaBase
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QTreeWidgetItem, QHeaderView, QDialog
+from PyQt6.Qsci import QsciScintillaBase

 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@

 from pygments.lexers import get_all_lexers

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QHeaderView, QTreeWidgetItem
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QHeaderView, QTreeWidgetItem

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorHighlightersPage import Ui_EditorHighlightersPage
--- a/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice
-from PyQt5.QtGui import QPalette, QFont, QColor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice
+from PyQt6.QtGui import QPalette, QFont, QColor
+from PyQt6.QtWidgets import (
     QColorDialog, QFontDialog, QInputDialog, QMenu, QTreeWidgetItem, QDialog
 )
--- a/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select the styles to be imported/exported.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QListWidgetItem, QAbstractButton
 )
--- a/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the editor highlighter keywords configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 from pygments.lexers import get_all_lexers

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_EditorLanguageTabIndentOverrideDialog import (
     Ui_EditorLanguageTabIndentOverrideDialog
--- a/eric7/Preferences/ConfigurationPages/EditorStylesPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorStylesPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the Editor Styles configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QColor, QPalette
-from PyQt5.QtWidgets import QColorDialog, QFontDialog
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QColor, QPalette
+from PyQt6.QtWidgets import QColorDialog, QFontDialog
+from PyQt6.Qsci import QsciScintilla

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorStylesPage import Ui_EditorStylesPage
--- a/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Editor Typing configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorTypingPage import Ui_EditorTypingPage
--- a/eric7/Preferences/ConfigurationPages/EmailPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EmailPage.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import socket
 import sys

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Preferences/ConfigurationPages/GraphicsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/GraphicsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Printer configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_GraphicsPage import Ui_GraphicsPage
--- a/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Help Viewers configuration page.
 """

-from PyQt5.QtWidgets import QButtonGroup
+from PyQt6.QtWidgets import QButtonGroup

 from Globals import getWebBrowserSupport
--- a/eric7/Preferences/ConfigurationPages/HexEditorPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/HexEditorPage.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 Module implementing the Hex Editor configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QFontDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QFontDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HexEditorPage import Ui_HexEditorPage
--- a/eric7/Preferences/ConfigurationPages/IconsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/IconsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QListWidgetItem
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QListWidgetItem

 from E5Gui.E5PathPicker import E5PathPickerModes
 from E5Gui.E5Application import e5App
--- a/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import os.path

-from PyQt5.QtCore import pyqtSlot, QDir
-from PyQt5.QtGui import QIcon, QPalette
-from PyQt5.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtCore import pyqtSlot, QDir
+from PyQt6.QtGui import QIcon, QPalette
+from PyQt6.QtWidgets import QListWidgetItem, QDialog

 from .Ui_IconsPreviewDialog import Ui_IconsPreviewDialog
--- a/eric7/Preferences/ConfigurationPages/InterfacePage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/InterfacePage.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import glob
 import os

-from PyQt5.QtCore import pyqtSlot, QTranslator
-from PyQt5.QtWidgets import QStyleFactory
+from PyQt6.QtCore import pyqtSlot, QTranslator
+from PyQt6.QtWidgets import QStyleFactory

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter or change the master password.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_MasterPasswordEntryDialog import Ui_MasterPasswordEntryDialog
--- a/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Sun May 16 20:07:24 2021 +0200
@@ -39,7 +39,7 @@

         # populate the chart theme combobox
         try:
-            from PyQt5.QtChart import QChart
+            from PyQt6.QtChart import QChart

             self.chartThemeComboBox.addItem(
                 self.tr("Automatic"), -1)
--- a/eric7/Preferences/ConfigurationPages/MimeTypesPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MimeTypesPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Text Mime Types configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ConfigurationPages/NetworkPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/NetworkPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Network configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ConfigurationPages/NotificationsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/NotificationsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the Notifications configuration page.
 """

-from PyQt5.QtCore import pyqtSlot, QPoint
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QApplication, QColorDialog
+from PyQt6.QtCore import pyqtSlot, QPoint
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QApplication, QColorDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NotificationsPage import Ui_NotificationsPage
--- a/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Plugin Manager configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5PathPicker import E5PathPickerModes

@@ -61,7 +61,7 @@
         self.downloadedOnlyCheckBox.setChecked(
             Preferences.getPluginManager("CheckInstalledOnly"))

-        self.__repositoryUrl = Preferences.getUI("PluginRepositoryUrl6")
+        self.__repositoryUrl = Preferences.getUI("PluginRepositoryUrl7")
         self.repositoryUrlEdit.setText(self.__repositoryUrl)

     def save(self):
@@ -102,7 +102,7 @@

         if self.repositoryUrlEdit.text() != self.__repositoryUrl:
             Preferences.setUI(
-                "PluginRepositoryUrl6", self.repositoryUrlEdit.text())
+                "PluginRepositoryUrl7", self.repositoryUrlEdit.text())

     @pyqtSlot(bool)
     def on_repositoryUrlEditButton_toggled(self, checked):
--- a/eric7/Preferences/ConfigurationPages/PrinterPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/PrinterPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Printer configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PrinterPage import Ui_PrinterPage
--- a/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Project Browser configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
--- a/eric7/Preferences/ConfigurationPages/PythonPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/PythonPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Python configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PythonPage import Ui_PythonPage
--- a/eric7/Preferences/ConfigurationPages/QtPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/QtPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Qt configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ConfigurationPages/SecurityPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/SecurityPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Security configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_SecurityPage import Ui_SecurityPage
--- a/eric7/Preferences/ConfigurationPages/ShellPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/ShellPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Shell configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QFontDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QFontDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ShellPage import Ui_ShellPage
--- a/eric7/Preferences/ConfigurationPages/TemplatesPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/TemplatesPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Templates configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QFontDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QFontDialog

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TemplatesPage import Ui_TemplatesPage
--- a/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Viewmanager configuration page.
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from E5Gui.E5Application import e5App
--- a/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Web Browser Appearance configuration page.
 """

-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QFontDialog
+from PyQt6.QtGui import QFont
+from PyQt6.QtWidgets import QFontDialog

 from E5Gui.E5PathPicker import E5PathPickerModes

@@ -53,25 +53,25 @@
             Preferences.getWebBrowser("MinimumLogicalFontSize"))

         self.standardFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("StandardFontFamily"),
+            QFont([Preferences.getWebBrowser("StandardFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, False))
         self.fixedFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("FixedFontFamily"),
+            QFont([Preferences.getWebBrowser("FixedFontFamily")],
                   fixedFontSize, QFont.Weight.Normal, False))
         self.serifFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("SerifFontFamily"),
+            QFont([Preferences.getWebBrowser("SerifFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, False))
         self.sansSerifFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("SansSerifFontFamily"),
+            QFont([Preferences.getWebBrowser("SansSerifFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, False))
         self.cursiveFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("CursiveFontFamily"),
+            QFont([Preferences.getWebBrowser("CursiveFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, True))
         self.fantasyFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("FantasyFontFamily"),
+            QFont([Preferences.getWebBrowser("FantasyFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, False))
         self.pictographFontCombo.setCurrentFont(
-            QFont(Preferences.getWebBrowser("PictographFontFamily"),
+            QFont([Preferences.getWebBrowser("PictographFontFamily")],
                   defaultFontSize, QFont.Weight.Normal, False))

         self.initColour("SecureUrlColor",
--- a/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Interface configuration page (variant for web browser).
 """

-from PyQt5.QtWidgets import QStyleFactory
+from PyQt6.QtWidgets import QStyleFactory

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the  Web Browser configuration page.
 """

-from PyQt5.QtCore import pyqtSlot, QLocale
+from PyQt6.QtCore import pyqtSlot, QLocale

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserPage import Ui_WebBrowserPage
--- a/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QCoreApplication, QDir, QLibraryInfo, QLocale
 )
-from PyQt5.QtWidgets import QListWidgetItem
+from PyQt6.QtWidgets import QListWidgetItem

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserSpellCheckingPage import Ui_WebBrowserSpellCheckingPage
@@ -56,8 +56,8 @@
                     QCoreApplication.applicationDirPath() +
                     "/qtwebengine_dictionaries"),
                 QDir.cleanPath(
-                    QLibraryInfo.location(
-                        QLibraryInfo.LibraryLocation.DataPath) +
+                    QLibraryInfo.path(
+                        QLibraryInfo.LibraryPath.DataPath) +
                     "/qtwebengine_dictionaries"
                 ),
             }
--- a/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing VirusTotal configuration page (web browser variant).
 """

-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserVirusTotalPage import Ui_WebBrowserVirusTotalPage
--- a/eric7/Preferences/HighlightingStylesFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/HighlightingStylesFile.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import json
 import time

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Preferences/MouseClickDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/MouseClickDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for the configuration of a mouse click sequence.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QEvent
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt, QEvent
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_MouseClickDialog import Ui_MouseClickDialog
--- a/eric7/Preferences/PreferencesLexer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/PreferencesLexer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a special QScintilla lexer to handle the preferences.
 """

-from PyQt5.QtCore import QCoreApplication, QObject
-from PyQt5.Qsci import QsciScintillaBase
+from PyQt6.QtCore import QCoreApplication, QObject
+from PyQt6.Qsci import QsciScintillaBase

 import Preferences
 import Globals
--- a/eric7/Preferences/ProgramsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ProgramsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import re
 import sys

-from PyQt5.QtCore import pyqtSlot, Qt, QProcess
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtWidgets import (
     QApplication, QTreeWidgetItem, QHeaderView, QDialog, QDialogButtonBox
 )
--- a/eric7/Preferences/ShortcutDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ShortcutDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog for the configuration of a keyboard shortcut.
 """

-from PyQt5.QtCore import pyqtSignal, QEvent, Qt
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSignal, QEvent, Qt
+from PyQt6.QtGui import QKeySequence
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_ShortcutDialog import Ui_ShortcutDialog
--- a/eric7/Preferences/Shortcuts.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/Shortcuts.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import contextlib

-from PyQt5.QtCore import QFile, QIODevice, QCoreApplication
-from PyQt5.QtGui import QKeySequence
+from PyQt6.QtCore import QFile, QIODevice, QCoreApplication
+from PyQt6.QtGui import QKeySequence

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ShortcutsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ShortcutsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import re

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtGui import QKeySequence
+from PyQt6.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ShortcutsFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ShortcutsFile.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import time
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Preferences/SubstyleDefinitionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/SubstyleDefinitionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the sub-style definition dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ToolConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ToolConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Preferences/ToolGroupConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ToolGroupConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import copy

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/Preferences/ViewProfileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/ViewProfileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to configure the various view profiles.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog
 from .Ui_ViewProfileSidebarsDialog import Ui_ViewProfileSidebarsDialog
--- a/eric7/Preferences/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Preferences/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -24,17 +24,17 @@
 import sys
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QDir, QPoint, QLocale, QSettings, QFileInfo, QCoreApplication, QByteArray,
     QSize, QUrl, Qt, QLibraryInfo, QDateTime
 )
-from PyQt5.QtGui import QColor, QFont, QPalette
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtGui import QColor, QFont, QPalette
+from PyQt6.QtWidgets import QApplication
 try:
-    from PyQt5.QtWebEngineWidgets import QWebEngineSettings
+    from PyQt6.QtWebEngineWidgets import QWebEngineSettings
 except ImportError:
     QWebEngineSettings = None
-from PyQt5.Qsci import QsciScintilla, QsciLexerPython
+from PyQt6.Qsci import QsciScintilla, QsciLexerPython

 from E5Gui import E5FileDialog

@@ -205,12 +205,12 @@
         "ProxyAccount/Ftp": "",
         "ProxyExceptions": "localhost,127.0.0.,::1",

-        "PluginRepositoryUrl6":
-        "https://eric-ide.python-projects.org/plugins6/repository.xml",
-        "VersionsUrls6": [
-            "https://eric-ide.python-projects.org/versions/versions6",
+        "PluginRepositoryUrl7":
+        "https://eric-ide.python-projects.org/plugins7/repository.xml",
+        "VersionsUrls7": [
+            "https://eric-ide.python-projects.org/versions/versions7",
             "https://die-offenbachs.homelinux.org/eric/versions/"
-            "versions6",
+            "versions7",
         ],

         "OpenOnStartup": 0,        # 0 = nothing
@@ -427,6 +427,7 @@
         "CallTipsEnabled": False,
         "CallTipsVisible": 0,
         "CallTipsStyle": QsciScintilla.CallTipsStyle.CallTipsNoContext,
+        "CallTipsPosition": QsciScintilla.CallTipsPosition.CallTipsBelowText,
         # show QScintilla calltips, if plug-in fails
         "CallTipsScintillaOnFail": False,

@@ -633,14 +634,6 @@
     else:
         editorDefaults["EOLMode"] = QsciScintilla.EolMode.EolUnix

-    try:
-        # since QScintilla 2.7.0
-        editorDefaults["CallTipsPosition"] = (
-            QsciScintilla.CallTipsPosition.CallTipsBelowText
-        )
-    except AttributeError:
-        editorDefaults["CallTipsPosition"] = 0
-
     editorColourDefaults = {
         "CurrentMarker": QColor(Qt.GlobalColor.yellow),
         "ErrorMarker": QColor(Qt.GlobalColor.red),
@@ -1613,9 +1606,6 @@
         dn.mkdir(".eric7")
     QCoreApplication.setOrganizationName(Globals.settingsNameOrganization)
     QCoreApplication.setApplicationName(Globals.settingsNameGlobal)
-    with contextlib.suppress(AttributeError):
-        Prefs.settings.setAtomicSyncRequired(False)
-        # backward compatibility for Qt < 5.10

     Prefs.settings.value("UI/SingleApplicationMode")

@@ -1978,7 +1968,7 @@
             return state
         else:
             return prefClass.uiDefaults[key]
-    elif key in ["VersionsUrls6"]:
+    elif key in ["VersionsUrls7"]:
         urls = toList(
             prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key]))
         if len(urls) == 0:
@@ -2107,22 +2097,48 @@
         return prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key])
     elif key in ["AutosaveInterval", "TabWidth", "IndentWidth",
-                 "FoldingStyle", "WarnFilesize", "EdgeMode", "EdgeColumn",
+                 "FoldingStyle", "WarnFilesize", "EdgeColumn",
                  "CaretWidth", "CaretLineFrameWidth", "AutoCompletionSource",
                  "AutoCompletionThreshold", "AutoCompletionTimeout",
                  "AutoCompletionCacheSize", "AutoCompletionCacheTime",
                  "AutoCompletionWatchdogTime", "AutoCompletionMaxLines",
                  "AutoCompletionMaxChars", "CallTipsVisible",
-                 "CallTipsStyle", "MarkOccurrencesTimeout", "SearchRegexpMode",
+                 "MarkOccurrencesTimeout", "SearchRegexpMode",
                  "AutoSpellCheckChunkSize", "SpellCheckingMinWordSize",
-                 "PostScriptLevel", "EOLMode", "ZoomFactor", "WhitespaceSize",
+                 "PostScriptLevel", "ZoomFactor", "WhitespaceSize",
                  "OnlineSyntaxCheckInterval", "OnlineChangeTraceInterval",
-                 "WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode",
-                 "WrapStartIndent", "CallTipsPosition", "VirtualSpaceOptions",
+                 "WrapStartIndent", "VirtualSpaceOptions",
                  "PreviewRefreshWaitTimer", "SourceOutlineWidth",
                  "SourceOutlineStepSize"]:
         return int(prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key]))
+    elif key == "WrapLongLinesMode":
+        return QsciScintilla.WrapMode(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "WrapVisualFlag":
+        return QsciScintilla.WrapVisualFlag(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "WrapIndentMode":
+        return QsciScintilla.WrapIndentMode(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "EdgeMode":
+        return QsciScintilla.EdgeMode(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "CallTipsStyle":
+        return QsciScintilla.CallTipsStyle(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "AutoCompletionSource":
+        return QsciScintilla.AutoCompletionSource(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "PythonBadIndentation":
+        return QsciLexerPython.IndentationWarning(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "EOLMode":
+        return QsciScintilla.EolMode(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
+    elif key == "CallTipsPosition":
+        return QsciScintilla.CallTipsPosition(int(prefClass.settings.value(
+            "Editor/" + key, prefClass.editorDefaults[key].value)))
     elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters",
                  "PreviewMarkdownFileNameExtensions",
                  "PreviewRestFileNameExtensions",
@@ -2131,14 +2147,6 @@
                  "FullSpellCheckExtensions"]:
         return toList(prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key]))
-    elif key in ["PythonBadIndentation"]:
-        value = prefClass.settings.value(
-            "Editor/" + key, prefClass.editorDefaults[key])
-        if value in ["true", "True"]:
-            value = 1
-        elif value in ["false", "False"]:
-            value = 0
-        return QsciLexerPython.IndentationWarning(int(value))
     elif key == "TabIndentOverride":
         overrideStr = prefClass.settings.value(
             "Editor/" + key, prefClass.editorDefaults[key])
@@ -2161,6 +2169,11 @@
     """
     if key == "TabIndentOverride":
         prefClass.settings.setValue("Editor/" + key, json.dumps(value))
+    elif key in ("WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode",
+                 "EdgeMode", "CallTipsStyle", "AutoCompletionSource",
+                 "PythonBadIndentation", "EOLMode", "CallTipsPosition"):
+        # value is an enum.Enum derived item
+        prefClass.settings.setValue("Editor/" + key, value.value)
     else:
         prefClass.settings.setValue("Editor/" + key, value)

@@ -2679,8 +2692,8 @@
         s = os.getenv(key.upper(), "")
     if s == "":
         s = os.path.join(
-            QLibraryInfo.location(
-                QLibraryInfo.LibraryLocation.DocumentationPath),
+            QLibraryInfo.path(
+                QLibraryInfo.LibraryPath.DocumentationPath),
             "qtdoc")
     return s

@@ -2959,8 +2972,8 @@
         "Qt/Qt5TranslationsDir",
         prefClass.qtDefaults["Qt5TranslationsDir"])
     if s == "":
-        s = QLibraryInfo.location(
-            QLibraryInfo.LibraryLocation.TranslationsPath)
+        s = QLibraryInfo.path(
+            QLibraryInfo.LibraryPath.TranslationsPath)
     if s == "" and Globals.isWindowsPlatform():
         transPath = os.path.join(Globals.getPyQt5ModulesDirectory(),
                                  "translations")
--- a/eric7/Project/AddDirectoryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/AddDirectoryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to add files of a directory to the project.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/AddFileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/AddFileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/AddFoundFilesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/AddFoundFilesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the found files to the user.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_AddFoundFilesDialog import Ui_AddFoundFilesDialog
--- a/eric7/Project/AddLanguageDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/AddLanguageDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to add a new language to the project.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_AddLanguageDialog import Ui_AddLanguageDialog
--- a/eric7/Project/CreateDialogCodeDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/CreateDialogCodeDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,12 +12,12 @@
 import json
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QMetaObject, QRegularExpression, QSortFilterProxyModel,
     QProcess, QProcessEnvironment
 )
-from PyQt5.QtGui import QStandardItemModel, QStandardItem, QBrush, QColor
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtGui import QStandardItemModel, QStandardItem, QBrush, QColor
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox


 from E5Gui.E5Application import e5App
--- a/eric7/Project/DebuggerPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/DebuggerPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QComboBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QComboBox

 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/DebuggerPropertiesFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/DebuggerPropertiesFile.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 import time
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Project/FiletypeAssociationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/FiletypeAssociationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import contextlib

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem

 from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog
--- a/eric7/Project/IdlCompilerDefineNameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/IdlCompilerDefineNameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 for the IDL compiler.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_IdlCompilerDefineNameDialog import Ui_IdlCompilerDefineNameDialog
--- a/eric7/Project/IdlCompilerOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/IdlCompilerOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter some IDL compiler options.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QInputDialog
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QInputDialog

 from .Ui_IdlCompilerOptionsDialog import Ui_IdlCompilerOptionsDialog
--- a/eric7/Project/LexerAssociationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/LexerAssociationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtWidgets import QHeaderView, QTreeWidgetItem, QDialog
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QHeaderView, QTreeWidgetItem, QDialog

 from .Ui_LexerAssociationDialog import Ui_LexerAssociationDialog
--- a/eric7/Project/MakePropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/MakePropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the properties for 'make'.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/NewDialogClassDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/NewDialogClassDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/NewPythonPackageDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/NewPythonPackageDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to add a new Python package.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot

 from .Ui_NewPythonPackageDialog import Ui_NewPythonPackageDialog
--- a/eric7/Project/Project.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/Project.py	Sun May 16 20:07:24 2021 +0200
@@ -16,15 +16,15 @@
 import zipfile
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice,
     QByteArray, QObject, QProcess
 )
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import (
-    QLineEdit, QToolBar, QDialog, QInputDialog, QApplication, QMenu, QAction
+from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtWidgets import (
+    QLineEdit, QToolBar, QDialog, QInputDialog, QApplication, QMenu
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
--- a/eric7/Project/ProjectBaseBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectBaseBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QModelIndex, pyqtSignal, Qt, QCoreApplication, QItemSelectionModel,
     QItemSelection, QElapsedTimer
 )
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QTreeView, QApplication, QMenu, QDialog, QAbstractItemView
 )

@@ -68,11 +68,11 @@
         self.isTranslationsBrowser = False
         self.expandedNames = []

-        self.SelectFlags = QItemSelectionModel.SelectionFlags(
+        self.SelectFlags = (
             QItemSelectionModel.SelectionFlag.Select |
             QItemSelectionModel.SelectionFlag.Rows
         )
-        self.DeselectFlags = QItemSelectionModel.SelectionFlags(
+        self.DeselectFlags = (
             QItemSelectionModel.SelectionFlag.Deselect |
             QItemSelectionModel.SelectionFlag.Rows
         )
--- a/eric7/Project/ProjectBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the project browser part of the eric UI.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QApplication

 from E5Gui.E5TabWidget import E5TabWidget
 from E5Gui.E5Led import E5ClickableLed
--- a/eric7/Project/ProjectBrowserModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectBrowserModel.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import re
 import contextlib

-from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
-from PyQt5.QtGui import QColor
+from PyQt6.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
+from PyQt6.QtGui import QColor

 from UI.BrowserModel import (
     BrowserModel, BrowserItem, BrowserDirectoryItem, BrowserFileItem
@@ -297,13 +297,13 @@
         if not index.isValid():
             return None

-        if role == Qt.ItemDataRole.TextColorRole:
+        if role == Qt.ItemDataRole.ForegroundRole:
             if index.column() == 0:
                 try:
                     return index.internalPointer().getTextColor()
                 except AttributeError:
                     return None
-        elif role == Qt.ItemDataRole.BackgroundColorRole:
+        elif role == Qt.ItemDataRole.BackgroundRole:
             try:
                 col = self.itemBackgroundColors[
                     index.internalPointer().vcsState]
@@ -346,13 +346,13 @@
         qdir = QDir(parentItem.dirName())

         fileFilter = (
-            QDir.Filters(
+            (
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
             if Preferences.getProject("BrowsersListHiddenFiles") else
-            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
         )
         entryInfoList = qdir.entryInfoList(fileFilter)

@@ -690,13 +690,13 @@
             return

         fileFilter = (
-            QDir.Filters(
+            (
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
             if Preferences.getProject("BrowsersListHiddenFiles") else
-            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
         )

         for itm in self.watchedItems[path]:
--- a/eric7/Project/ProjectFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectFile.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 import contextlib
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Project/ProjectFormsBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectFormsBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
-from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu
+from PyQt6.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
+from PyQt6.QtWidgets import QDialog, QInputDialog, QApplication, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Project/ProjectInterfacesBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectInterfacesBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import glob
 import contextlib

-from PyQt5.QtCore import QThread, pyqtSignal, QProcess
-from PyQt5.QtWidgets import QDialog, QApplication, QMenu
+from PyQt6.QtCore import QThread, pyqtSignal, QProcess
+from PyQt6.QtWidgets import QDialog, QApplication, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Project/ProjectOthersBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectOthersBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import contextlib

-from PyQt5.QtCore import QModelIndex, pyqtSignal, QUrl
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialog, QMenu
+from PyQt6.QtCore import QModelIndex, pyqtSignal, QUrl
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QDialog, QMenu

 from E5Gui import E5MessageBox
--- a/eric7/Project/ProjectProtocolsBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectProtocolsBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -13,8 +13,8 @@
 import sys
 import contextlib

-from PyQt5.QtCore import QThread, pyqtSignal, QProcess
-from PyQt5.QtWidgets import QDialog, QApplication, QMenu
+from PyQt6.QtCore import QThread, pyqtSignal, QProcess
+from PyQt6.QtWidgets import QDialog, QApplication, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/Project/ProjectResourcesBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectResourcesBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
-from PyQt5.QtWidgets import QDialog, QApplication, QMenu
+from PyQt6.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
+from PyQt6.QtWidgets import QDialog, QApplication, QMenu

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Project/ProjectSourcesBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectSourcesBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtWidgets import QDialog, QInputDialog, QMenu
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import QDialog, QInputDialog, QMenu

 from E5Gui import E5MessageBox
--- a/eric7/Project/ProjectTranslationsBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectTranslationsBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -14,8 +14,8 @@
 import functools
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QProcess
-from PyQt5.QtWidgets import QDialog, QMenu
+from PyQt6.QtCore import pyqtSignal, QProcess
+from PyQt6.QtWidgets import QDialog, QMenu

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Project/PropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/PropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QDir, pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QDir, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5Application import e5App
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/QuickFindFileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/QuickFindFileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/Project/RccCompilerOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/RccCompilerOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter some non-common rcc compiler options.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_RccCompilerOptionsDialog import Ui_RccCompilerOptionsDialog
--- a/eric7/Project/SpellingPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/SpellingPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Spelling Properties dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/Project/TranslationPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/TranslationPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QListWidgetItem, QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QListWidgetItem, QDialog, QDialogButtonBox

 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
--- a/eric7/Project/UicCompilerOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/UicCompilerOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter some non-common uic compiler options.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_UicCompilerOptionsDialog import Ui_UicCompilerOptionsDialog
--- a/eric7/Project/UicLoadUi5.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/UicLoadUi5.py	Sun May 16 20:07:24 2021 +0200
@@ -14,15 +14,16 @@
 import contextlib

 try:
-    from PyQt5.QtCore import QMetaMethod, QByteArray
-    from PyQt5.QtWidgets import QAction, QWidget, QApplication
-    from PyQt5 import uic
+    from PyQt6.QtCore import QMetaMethod, QByteArray
+    from PyQt6.QtGui import QAction
+    from PyQt6.QtWidgets import QWidget, QApplication
+    from PyQt6 import uic
 except ImportError:
     print("PyQt5 could not be found.")
     sys.exit(1)

 with contextlib.suppress(ImportError):
-    from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__

 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 # add the eric package directory
--- a/eric7/Project/UserProjectFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/UserProjectFile.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import time
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Project/UserPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/UserPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the user specific project properties dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/PyUnit/UnittestDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/PyUnit/UnittestDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -14,9 +14,9 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import (
     QWidget, QDialog, QApplication, QDialogButtonBox, QListWidgetItem,
     QComboBox, QTreeWidgetItem
 )
--- a/eric7/QScintilla/APIsManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/APIsManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QDir, QFileInfo, pyqtSignal, QObject
-from PyQt5.Qsci import QsciAPIs
+from PyQt6.QtCore import QDir, QFileInfo, pyqtSignal, QObject
+from PyQt6.Qsci import QsciAPIs

 from . import Lexers
 import Preferences
--- a/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5Application import e5App
--- a/eric7/QScintilla/DocstringGenerator/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/DocstringGenerator/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Package containing the documentation string generator tool.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication


 def getDocstringGenerator(editor):
--- 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):
         """
--- a/eric7/QScintilla/EditorAssembly.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/EditorAssembly.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import contextlib

-from PyQt5.QtCore import QTimer
-from PyQt5.QtWidgets import QWidget, QGridLayout, QComboBox
+from PyQt6.QtCore import QTimer
+from PyQt6.QtWidgets import QWidget, QGridLayout, QComboBox

 from E5Gui.E5Application import e5App
--- a/eric7/QScintilla/EditorButtonsWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/EditorButtonsWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QToolButton, QFrame, QMenu, QSizePolicy, QScrollArea
 )
--- a/eric7/QScintilla/EditorOutline.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/EditorOutline.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QModelIndex, QPoint
-from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QMenu, QApplication
+from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QModelIndex, QPoint
+from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QMenu, QApplication

 from UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
 from UI.BrowserModel import (
@@ -201,7 +201,7 @@

         @param mouseEvent the mouse event (QMouseEvent)
         """
-        index = self.indexAt(mouseEvent.pos())
+        index = self.indexAt(mouseEvent.position().toPoint())
         if index.isValid():
             itm = self.model().item(index)
             if isinstance(itm, (BrowserImportsItem, BrowserGlobalsItem)):
--- a/eric7/QScintilla/EditorOutlineModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/EditorOutlineModel.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QCoreApplication, QModelIndex
+from PyQt6.QtCore import QCoreApplication, QModelIndex

 from UI.BrowserModel import (
     BrowserModel, BrowserItem, BrowserClassItem, BrowserCodingItem,
--- a/eric7/QScintilla/Exporters/ExporterBase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterBase.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the exporter base class.
 """

-from PyQt5.QtCore import QFileInfo, QObject, QCoreApplication
+from PyQt6.QtCore import QFileInfo, QObject, QCoreApplication

 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/QScintilla/Exporters/ExporterHTML.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterHTML.py	Sun May 16 20:07:24 2021 +0200
@@ -15,9 +15,9 @@
 import io
 import contextlib

-from PyQt5.QtGui import QFontInfo
-from PyQt5.QtWidgets import QInputDialog
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtGui import QFontInfo
+from PyQt6.QtWidgets import QInputDialog
+from PyQt6.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/QScintilla/Exporters/ExporterODT.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterODT.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing an exporter for ODT.
 """

-from PyQt5.QtGui import QTextDocument, QTextDocumentWriter
+from PyQt6.QtGui import QTextDocument, QTextDocumentWriter

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/QScintilla/Exporters/ExporterPDF.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterPDF.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>

-from PyQt5.QtGui import QFontInfo
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtGui import QFontInfo
+from PyQt6.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/QScintilla/Exporters/ExporterRTF.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterRTF.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@

 import time

-from PyQt5.QtGui import QFontInfo
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtGui import QFontInfo
+from PyQt6.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/QScintilla/Exporters/ExporterTEX.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/ExporterTEX.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@

 import os

-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverrideCursor
--- a/eric7/QScintilla/Exporters/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Exporters/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Package implementing exporters for various file formats.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication


 def getSupportedFormats():
--- a/eric7/QScintilla/GotoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/GotoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Goto dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_GotoDialog import Ui_GotoDialog
--- a/eric7/QScintilla/KeySequenceTranslator.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/KeySequenceTranslator.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 QKeySequence standard keys.
 """

-from PyQt5.QtGui import QKeySequence
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.QtGui import QKeySequence
+from PyQt6.Qsci import QsciScintilla

 __all__ = ["s2qTranslate"]
--- a/eric7/QScintilla/Lexers/LexerBash.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerBash.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Bash lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerBash
+from PyQt6.Qsci import QsciLexerBash

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerBatch.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerBatch.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Batch file lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerBatch
+from PyQt6.Qsci import QsciLexerBatch

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerCMake.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerCMake.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a CMake lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerCMake
+from PyQt6.Qsci import QsciLexerCMake

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerCPP.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerCPP.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerCPP, QsciScintilla
+from PyQt6.Qsci import QsciLexerCPP, QsciScintilla

 from .SubstyledLexer import SubstyledLexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerCSS.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerCSS.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerCSS
+from PyQt6.Qsci import QsciLexerCSS

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerCSharp.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerCSharp.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a C# lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerCSharp, QsciScintilla
+from PyQt6.Qsci import QsciLexerCSharp, QsciScintilla

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerCoffeeScript.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerCoffeeScript.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a CoffeeScript lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerCoffeeScript
+from PyQt6.Qsci import QsciLexerCoffeeScript

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerContainer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerContainer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a base class for custom lexers.
 """

-from PyQt5.Qsci import QsciLexer
+from PyQt6.Qsci import QsciLexer

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerD.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerD.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a D lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerD, QsciScintilla
+from PyQt6.Qsci import QsciLexerD, QsciScintilla

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerDiff.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerDiff.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Diff lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerDiff
+from PyQt6.Qsci import QsciLexerDiff

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerFortran.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerFortran.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerFortran
+from PyQt6.Qsci import QsciLexerFortran

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerFortran77.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerFortran77.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Fortran lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerFortran77
+from PyQt6.Qsci import QsciLexerFortran77

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerHTML.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerHTML.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerHTML
+from PyQt6.Qsci import QsciLexerHTML

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerIDL.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerIDL.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing an IDL lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerIDL, QsciScintilla
+from PyQt6.Qsci import QsciLexerIDL, QsciScintilla

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerJSON.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerJSON.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a JSON lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerJSON
+from PyQt6.Qsci import QsciLexerJSON

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerJava.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerJava.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Java lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerJava, QsciScintilla
+from PyQt6.Qsci import QsciLexerJava, QsciScintilla

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerJavaScript.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerJavaScript.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a JavaScript lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerJavaScript, QsciScintilla
+from PyQt6.Qsci import QsciLexerJavaScript, QsciScintilla

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerLua.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerLua.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Lua lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerLua
+from PyQt6.Qsci import QsciLexerLua

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerMakefile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerMakefile.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Makefile lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerMakefile
+from PyQt6.Qsci import QsciLexerMakefile

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerMarkdown.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerMarkdown.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Markdown lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerMarkdown
+from PyQt6.Qsci import QsciLexerMarkdown

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerMatlab.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerMatlab.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Matlab lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerMatlab
+from PyQt6.Qsci import QsciLexerMatlab

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerOctave.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerOctave.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Octave lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerOctave
+from PyQt6.Qsci import QsciLexerOctave

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerPO.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPO.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Gettext lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerPO
+from PyQt6.Qsci import QsciLexerPO

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerPOV.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPOV.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a Povray lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerPOV
+from PyQt6.Qsci import QsciLexerPOV

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerPascal.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPascal.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerPascal
+from PyQt6.Qsci import QsciLexerPascal

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerPerl.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPerl.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerPerl
+from PyQt6.Qsci import QsciLexerPerl

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerPostScript.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPostScript.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a PostScript lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerPostScript
+from PyQt6.Qsci import QsciLexerPostScript

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerProperties.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerProperties.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerProperties
+from PyQt6.Qsci import QsciLexerProperties

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerPygments.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPygments.py	Sun May 16 20:07:24 2021 +0200
@@ -15,7 +15,7 @@
 )
 from pygments.util import ClassNotFound

-from PyQt5.QtGui import QColor, QFont
+from PyQt6.QtGui import QColor, QFont

 from QScintilla.Lexers.LexerContainer import LexerContainer

@@ -390,22 +390,22 @@
         if style in [PYGMENTS_COMMENT, PYGMENTS_PREPROCESSOR,
                      PYGMENTS_MULTILINECOMMENT]:
             if Utilities.isWindowsPlatform():
-                f = QFont("Comic Sans MS", 9)
+                f = QFont(["Comic Sans MS"], 9)
             elif Utilities.isMacPlatform():
-                f = QFont("Courier", 11)
+                f = QFont(["Courier"], 11)
             else:
-                f = QFont("Bitstream Vera Serif", 9)
+                f = QFont(["Bitstream Vera Serif"], 9)
             if style == PYGMENTS_PREPROCESSOR:
                 f.setItalic(True)
             return f

         if style in [PYGMENTS_STRING, PYGMENTS_CHAR]:
             if Utilities.isWindowsPlatform():
-                return QFont("Comic Sans MS", 10)
+                return QFont(["Comic Sans MS"], 10)
             elif Utilities.isMacPlatform():
-                f = QFont("Courier", 11)
+                f = QFont(["Courier"], 11)
             else:
-                return QFont("Bitstream Vera Serif", 10)
+                return QFont(["Bitstream Vera Serif"], 10)

         if style in [PYGMENTS_KEYWORD, PYGMENTS_OPERATOR, PYGMENTS_WORD,
                      PYGMENTS_BUILTIN, PYGMENTS_ATTRIBUTE, PYGMENTS_FUNCTION,
--- a/eric7/QScintilla/Lexers/LexerPython.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerPython.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import re
 import contextlib

-from PyQt5.Qsci import QsciLexerPython, QsciScintilla
+from PyQt6.Qsci import QsciLexerPython, QsciScintilla

 from .SubstyledLexer import SubstyledLexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerQSS.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerQSS.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerCSS
+from PyQt6.Qsci import QsciLexerCSS

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerRuby.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerRuby.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerRuby
+from PyQt6.Qsci import QsciLexerRuby

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerSQL.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerSQL.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerSQL
+from PyQt6.Qsci import QsciLexerSQL

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerTCL.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerTCL.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerTCL
+from PyQt6.Qsci import QsciLexerTCL

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/LexerTeX.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerTeX.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerTeX
+from PyQt6.Qsci import QsciLexerTeX

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerVHDL.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerVHDL.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a VHDL lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerVHDL
+from PyQt6.Qsci import QsciLexerVHDL

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerXML.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerXML.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.Qsci import QsciLexerXML
+from PyQt6.Qsci import QsciLexerXML

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/LexerYAML.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/LexerYAML.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a YAML lexer with some additional methods.
 """

-from PyQt5.Qsci import QsciLexerYAML
+from PyQt6.Qsci import QsciLexerYAML

 from .Lexer import Lexer
 import Preferences
--- a/eric7/QScintilla/Lexers/SubstyledLexer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/SubstyledLexer.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import copy

-from PyQt5.QtGui import QColor
+from PyQt6.QtGui import QColor

 from .Lexer import Lexer
--- a/eric7/QScintilla/Lexers/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Lexers/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Package implementing lexers for the various supported programming languages.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 import Preferences
 import UI.PixmapCache
--- a/eric7/QScintilla/MarkupProviders/HtmlProvider.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/HtmlProvider.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the HTML markup provider.
 """

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtWidgets import QDialog, QInputDialog
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QDialog, QInputDialog

 from .MarkupBase import MarkupBase
--- a/eric7/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data to insert a hyperlink.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HyperlinkMarkupDialog import Ui_HyperlinkMarkupDialog
--- a/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, QSize
-from PyQt5.QtGui import QImage, QImageReader
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QSize
+from PyQt6.QtGui import QImage, QImageReader
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/QScintilla/MarkupProviders/MarkdownProvider.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/MarkdownProvider.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Markdown markup provider.
 """

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtWidgets import QDialog, QInputDialog
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QDialog, QInputDialog

 from .MarkupBase import MarkupBase
--- a/eric7/QScintilla/MarkupProviders/RestructuredTextProvider.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/RestructuredTextProvider.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the reStructured Text markup provider.
 """

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtWidgets import QDialog, QInputDialog
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QDialog, QInputDialog

 from .MarkupBase import MarkupBase
--- 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():
--- a/eric7/QScintilla/Printer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Printer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the printer functionality.
 """

-from PyQt5.QtCore import QTime, QDate, Qt, QCoreApplication
-from PyQt5.QtGui import QColor
-from PyQt5.QtPrintSupport import QPrinter
-from PyQt5.Qsci import QsciPrinter
+from PyQt6.QtCore import QTime, QDate, Qt, QCoreApplication
+from PyQt6.QtGui import QColor
+from PyQt6.QtPrintSupport import QPrinter
+from PyQt6.Qsci import QsciPrinter

 import Preferences
--- a/eric7/QScintilla/QsciScintillaCompat.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/QsciScintillaCompat.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import contextlib

-from PyQt5.QtCore import pyqtSignal, Qt, QPoint
-from PyQt5.QtGui import QPalette, QColor, QFontMetrics
-from PyQt5.QtWidgets import QApplication, QListWidget
-from PyQt5.Qsci import (
+from PyQt6.QtCore import pyqtSignal, Qt, QPoint
+from PyQt6.QtGui import QPalette, QColor, QFontMetrics
+from PyQt6.QtWidgets import QApplication, QListWidget
+from PyQt6.Qsci import (
     QsciScintillaBase, QsciScintilla,
     QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION
 )
@@ -43,7 +43,7 @@
     """
     zoomValueChanged = pyqtSignal(int)

-    ArrowFoldStyle = QsciScintilla.FoldStyle.BoxedTreeFoldStyle + 1
+    ArrowFoldStyle = QsciScintilla.FoldStyle.BoxedTreeFoldStyle.value + 1
     ArrowTreeFoldStyle = ArrowFoldStyle + 1

     UserSeparator = '\x04'
@@ -1304,8 +1304,8 @@
         @param style folding style to set (integer)
         @param margin margin number (integer)
         """
-        if style < self.ArrowFoldStyle:
-            super().setFolding(style, margin)
+        if isinstance(style, QsciScintilla.FoldStyle):
+            super().setFolding(QsciScintilla.FoldStyle(style), margin)
         else:
             super().setFolding(
                 QsciScintilla.FoldStyle.PlainFoldStyle, margin)
--- a/eric7/QScintilla/SearchReplaceWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/SearchReplaceWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import re
 import contextlib

-from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot, QEvent
-from PyQt5.QtGui import QColor, QPalette
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot, QEvent
+from PyQt6.QtGui import QColor, QPalette
+from PyQt6.QtWidgets import (
     QWidget, QHBoxLayout, QToolButton, QScrollArea, QSizePolicy, QFrame
 )
--- a/eric7/QScintilla/Shell.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Shell.py	Sun May 16 20:07:24 2021 +0200
@@ -12,13 +12,13 @@
 import contextlib
 import enum

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileInfo, Qt, QEvent
-from PyQt5.QtGui import QClipboard, QPalette, QFont
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFileInfo, Qt, QEvent
+from PyQt6.QtGui import QClipboard, QPalette, QFont, QShortcut
+from PyQt6.QtWidgets import (
     QDialog, QInputDialog, QApplication, QMenu, QWidget, QHBoxLayout,
-    QVBoxLayout, QShortcut, QSizePolicy
+    QVBoxLayout, QSizePolicy
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -436,7 +436,7 @@
         key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
         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.setLexer(self.lexer_)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
@@ -1248,7 +1248,7 @@
         @param event the mouse press event (QMouseEvent)
         """
         self.setFocus()
-        if event.button() == Qt.MouseButton.MidButton:
+        if event.button() == Qt.MouseButton.MiddleButton:
             lines = QApplication.clipboard().text(QClipboard.Mode.Selection)
             self.paste(lines)
         else:
--- a/eric7/QScintilla/ShellHistoryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/ShellHistoryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QItemSelectionModel
-from PyQt5.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtCore import pyqtSlot, Qt, QItemSelectionModel
+from PyQt6.QtWidgets import QListWidgetItem, QDialog

 from .Ui_ShellHistoryDialog import Ui_ShellHistoryDialog
--- a/eric7/QScintilla/ShellWindow.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/ShellWindow.py	Sun May 16 20:07:24 2021 +0200
@@ -10,14 +10,14 @@
 import sys
 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     Qt, QCoreApplication, QPoint, QSize, QSignalMapper, QProcess
 )
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import (
-    QWidget, QVBoxLayout, QApplication, QAction, QWhatsThis, QDialog
+from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtWidgets import (
+    QWidget, QVBoxLayout, QApplication, QWhatsThis, QDialog
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5Action import E5Action, createActionGroup
--- a/eric7/QScintilla/SortOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/SortOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the sort options for a line sort.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_SortOptionsDialog import Ui_SortOptionsDialog
--- a/eric7/QScintilla/SpellChecker.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/SpellChecker.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 import os
 import contextlib

-from PyQt5.QtCore import QTimer, QObject
+from PyQt6.QtCore import QTimer, QObject

 import Preferences
 import Utilities
--- a/eric7/QScintilla/SpellCheckingDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/SpellCheckingDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the spell checking dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_SpellCheckingDialog import Ui_SpellCheckingDialog
--- a/eric7/QScintilla/SpellingDictionaryEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/SpellingDictionaryEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
+from PyQt6.QtWidgets import QDialog

 from .Ui_SpellingDictionaryEditDialog import Ui_SpellingDictionaryEditDialog
--- a/eric7/QScintilla/TypingCompleters/CompleterBase.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/TypingCompleters/CompleterBase.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 user types '(').
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 class CompleterBase(QObject):
--- a/eric7/QScintilla/TypingCompleters/CompleterPython.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/TypingCompleters/CompleterPython.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.Qsci import QsciLexerPython, QsciScintilla
+from PyQt6.Qsci import QsciLexerPython, QsciScintilla

 from .CompleterBase import CompleterBase
--- a/eric7/QScintilla/TypingCompleters/CompleterRuby.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/TypingCompleters/CompleterRuby.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.Qsci import QsciLexerRuby, QsciScintilla
+from PyQt6.Qsci import QsciLexerRuby, QsciScintilla

 from .CompleterBase import CompleterBase
--- a/eric7/QScintilla/TypingCompleters/CompleterYaml.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/TypingCompleters/CompleterYaml.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from .CompleterBase import CompleterBase
--- a/eric7/QScintilla/ZoomDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/ZoomDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select the zoom scale.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_ZoomDialog import Ui_ZoomDialog
--- a/eric7/Sessions/SessionFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Sessions/SessionFile.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import json
 import time

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Snapshot/SnapWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -15,12 +15,12 @@
 import re
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, Qt, QFile, QFileInfo, QTimer, QPoint, QMimeData, QLocale,
     QStandardPaths
 )
-from PyQt5.QtGui import QImageWriter, QPixmap, QDrag, QKeySequence
-from PyQt5.QtWidgets import QWidget, QApplication, QShortcut
+from PyQt6.QtGui import QImageWriter, QPixmap, QDrag, QKeySequence, QShortcut
+from PyQt6.QtWidgets import QWidget, QApplication

 from E5Gui import E5FileDialog, E5MessageBox
--- a/eric7/Snapshot/SnapshotDefaultGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotDefaultGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a grabber object for non-Wayland desktops.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QObject, QTimer, QEvent
-from PyQt5.QtGui import QPixmap, QCursor, QGuiApplication
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSignal, Qt, QObject, QTimer, QEvent
+from PyQt6.QtGui import QPixmap, QCursor, QGuiApplication
+from PyQt6.QtWidgets import QWidget

 from .SnapshotModes import SnapshotModes
--- a/eric7/Snapshot/SnapshotFreehandGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotFreehandGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
-from PyQt5.QtGui import (
+from PyQt6.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
+from PyQt6.QtGui import (
     QPixmap, QColor, QRegion, QPainter, QPalette, QPolygon, QPen, QBrush,
     QPaintEngine, QGuiApplication, QCursor
 )
-from PyQt5.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QWidget, QToolTip

 import Globals

@@ -252,14 +252,14 @@

         @param evt mouse press event (QMouseEvent)
         """
-        self.__pBefore = evt.pos()
+        self.__pBefore = evt.position().toPoint()

-        self.__showHelp = not self.__helpTextRect.contains(evt.pos())
+        self.__showHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if evt.button() == Qt.MouseButton.LeftButton:
             self.__mouseDown = True
-            self.__dragStartPoint = evt.pos()
+            self.__dragStartPoint = evt.position().toPoint()
             self.__selectionBeforeDrag = QPolygon(self.__selection)
-            if not self.__selection.containsPoint(evt.pos(),
+            if not self.__selection.containsPoint(evt.position().toPoint(),
                                                   Qt.FillRule.WindingFill):
                 self.__newSelection = True
                 self.__selection = QPolygon()
@@ -277,19 +277,19 @@

         @param evt mouse move event (QMouseEvent)
         """
-        shouldShowHelp = not self.__helpTextRect.contains(evt.pos())
+        shouldShowHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if shouldShowHelp != self.__showHelp:
             self.__showHelp = shouldShowHelp
             self.update()

         if self.__mouseDown:
             if self.__newSelection:
-                p = evt.pos()
+                p = evt.position().toPoint()
                 self.__selection.append(p)
             else:
                 # moving the whole selection
-                p = evt.pos() - self.__pBefore  # Offset
-                self.__pBefore = evt.pos()  # save position for next iteration
+                p = evt.position().toPoint() - self.__pBefore  # Offset
+                self.__pBefore = evt.position().toPoint()  # save position for next iteration
                 self.__selection.translate(p)

             self.update()
@@ -297,7 +297,7 @@
             if self.__selection.boundingRect().isEmpty():
                 return

-            if self.__selection.containsPoint(evt.pos(),
+            if self.__selection.containsPoint(evt.position().toPoint(),
                                               Qt.FillRule.WindingFill):
                 self.setCursor(Qt.CursorShape.OpenHandCursor)
             else:
@@ -311,7 +311,7 @@
         """
         self.__mouseDown = False
         self.__newSelection = False
-        if self.__selection.containsPoint(evt.pos(), Qt.FillRule.WindingFill):
+        if self.__selection.containsPoint(evt.position().toPoint(), Qt.FillRule.WindingFill):
             self.setCursor(Qt.CursorShape.OpenHandCursor)
         self.update()
--- a/eric7/Snapshot/SnapshotPreview.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotPreview.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the snapshot preview label.
 """

-from PyQt5.QtCore import pyqtSignal, QPoint, Qt
-from PyQt5.QtWidgets import QLabel, QApplication
+from PyQt6.QtCore import pyqtSignal, QPoint, Qt
+from PyQt6.QtWidgets import QLabel, QApplication


 class SnapshotPreview(QLabel):
@@ -56,7 +56,7 @@
         @param evt mouse button press event (QMouseEvent)
         """
         if evt.button() == Qt.MouseButton.LeftButton:
-            self.__mouseClickPoint = evt.pos()
+            self.__mouseClickPoint = evt.position().toPoint()

     def mouseReleaseEvent(self, evt):
         """
@@ -74,7 +74,7 @@
         """
         if (
             self.__mouseClickPoint != QPoint(0, 0) and
-            (evt.pos() - self.__mouseClickPoint).manhattanLength() >
+            (evt.position().toPoint() - self.__mouseClickPoint).manhattanLength() >
             QApplication.startDragDistance()
         ):
             self.__mouseClickPoint = QPoint(0, 0)
--- a/eric7/Snapshot/SnapshotRegionGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotRegionGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing a grabber widget for a rectangular snapshot region.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
-from PyQt5.QtGui import (
+from PyQt6.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
+from PyQt6.QtGui import (
     QPixmap, QColor, QRegion, QPainter, QPalette, QPaintEngine, QPen, QBrush,
     QGuiApplication, QCursor
 )
-from PyQt5.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QWidget, QToolTip

 import Globals

@@ -286,12 +286,12 @@

         @param evt mouse press event (QMouseEvent)
         """
-        self.__showHelp = not self.__helpTextRect.contains(evt.pos())
+        self.__showHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if evt.button() == Qt.MouseButton.LeftButton:
             self.__mouseDown = True
-            self.__dragStartPoint = evt.pos()
+            self.__dragStartPoint = evt.position().toPoint()
             self.__selectionBeforeDrag = QRect(self.__selection)
-            if not self.__selection.contains(evt.pos()):
+            if not self.__selection.contains(evt.position().toPoint()):
                 self.__newSelection = True
                 self.__selection = QRect()
             else:
@@ -308,14 +308,14 @@

         @param evt mouse move event (QMouseEvent)
         """
-        shouldShowHelp = not self.__helpTextRect.contains(evt.pos())
+        shouldShowHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if shouldShowHelp != self.__showHelp:
             self.__showHelp = shouldShowHelp
             self.update()

         if self.__mouseDown:
             if self.__newSelection:
-                p = evt.pos()
+                p = evt.position().toPoint()
                 r = self.rect()
                 self.__selection = self.__normalizeSelection(
                     QRect(self.__dragStartPoint,
@@ -324,7 +324,7 @@
                 # moving the whole selection
                 r = self.rect().normalized()
                 s = self.__selectionBeforeDrag.normalized()
-                p = s.topLeft() + evt.pos() - self.__dragStartPoint
+                p = s.topLeft() + evt.position().toPoint() - self.__dragStartPoint
                 r.setBottomRight(
                     r.bottomRight() - QPoint(s.width(), s.height()) +
                     QPoint(1, 1))
@@ -333,7 +333,7 @@
             else:
                 # dragging a handle
                 r = QRect(self.__selectionBeforeDrag)
-                offset = evt.pos() - self.__dragStartPoint
+                offset = evt.position().toPoint() - self.__dragStartPoint

                 if self.__mouseOverHandle in [
                         self.__TLHandle, self.__THandle, self.__TRHandle]:
@@ -363,14 +363,14 @@

             found = False
             for r in self.__handles:
-                if r.contains(evt.pos()):
+                if r.contains(evt.position().toPoint()):
                     self.__mouseOverHandle = r
                     found = True
                     break

             if not found:
                 self.__mouseOverHandle = None
-                if self.__selection.contains(evt.pos()):
+                if self.__selection.contains(evt.position().toPoint()):
                     self.setCursor(Qt.CursorShape.OpenHandCursor)
                 else:
                     self.setCursor(Qt.CursorShape.CrossCursor)
@@ -398,7 +398,7 @@
         self.__newSelection = False
         if (
             self.__mouseOverHandle is None and
-            self.__selection.contains(evt.pos())
+            self.__selection.contains(evt.position().toPoint())
         ):
             self.setCursor(Qt.CursorShape.OpenHandCursor)
         self.update()
--- a/eric7/Snapshot/SnapshotTimer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotTimer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the snapshot timer widget.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QTimer, QRect
-from PyQt5.QtGui import QPainter, QPalette
-from PyQt5.QtWidgets import QWidget, QApplication, QToolTip
+from PyQt6.QtCore import pyqtSignal, Qt, QTimer, QRect
+from PyQt6.QtGui import QPainter, QPalette
+from PyQt6.QtWidgets import QWidget, QApplication, QToolTip


 class SnapshotTimer(QWidget):
--- a/eric7/Snapshot/SnapshotWaylandGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotWaylandGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -11,12 +11,12 @@
 import uuid
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QObject, QTimer
-from PyQt5.QtGui import QPixmap, QCursor
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtCore import pyqtSignal, QObject, QTimer
+from PyQt6.QtGui import QPixmap, QCursor
+from PyQt6.QtWidgets import QApplication

 try:
-    from PyQt5.QtDBus import QDBusInterface, QDBusMessage
+    from PyQt6.QtDBus import QDBusInterface, QDBusMessage
     DBusAvailable = True
 except ImportError:
     DBusAvailable = False
--- a/eric7/SqlBrowser/SqlBrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/SqlBrowser/SqlBrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the SQL Browser main window.
 """

-from PyQt5.QtCore import QTimer, QUrl
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtSql import QSqlError, QSqlDatabase
+from PyQt6.QtCore import QTimer, QUrl
+from PyQt6.QtGui import QKeySequence
+from PyQt6.QtSql import QSqlError, QSqlDatabase

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/SqlBrowser/SqlBrowserWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/SqlBrowser/SqlBrowserWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the SQL Browser widget.
 """

-from PyQt5.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
-from PyQt5.QtGui import QStandardItemModel
-from PyQt5.QtWidgets import QWidget, QDialog, QAbstractItemView
-from PyQt5.QtSql import (
+from PyQt6.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
+from PyQt6.QtGui import QStandardItemModel
+from PyQt6.QtWidgets import QWidget, QDialog, QAbstractItemView
+from PyQt6.QtSql import (
     QSqlDatabase, QSqlError, QSqlTableModel, QSqlQueryModel, QSqlQuery
 )
--- a/eric7/SqlBrowser/SqlConnectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/SqlBrowser/SqlConnectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to enter the connection parameters.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
-from PyQt5.QtSql import QSqlDatabase
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtSql import QSqlDatabase

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/SqlBrowser/SqlConnectionWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/SqlBrowser/SqlConnectionWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,11 +7,12 @@
 Module implementing a widget showing the SQL connections.
 """

-from PyQt5.QtCore import pyqtSignal, Qt
-from PyQt5.QtWidgets import (
-    QWidget, QHeaderView, QTreeWidget, QVBoxLayout, QTreeWidgetItem, QAction
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import (
+    QWidget, QHeaderView, QTreeWidget, QVBoxLayout, QTreeWidgetItem
 )
-from PyQt5.QtSql import QSqlDatabase
+from PyQt6.QtSql import QSqlDatabase


 class SqlConnectionWidget(QWidget):
--- a/eric7/Tasks/Task.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tasks/Task.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import os
 import time

-from PyQt5.QtCore import Qt, QUuid
-from PyQt5.QtWidgets import QTreeWidgetItem
+from PyQt6.QtCore import Qt, QUuid
+from PyQt6.QtWidgets import QTreeWidgetItem

 import UI.PixmapCache
 import Preferences
--- a/eric7/Tasks/TaskFilterConfigDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tasks/TaskFilterConfigDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the task filter configuration dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Task import TaskType, TaskPriority
--- a/eric7/Tasks/TaskPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tasks/TaskPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import time

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Completers import E5FileCompleter
--- a/eric7/Tasks/TaskViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tasks/TaskViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -15,8 +15,8 @@
 import fnmatch
 import threading

-from PyQt5.QtCore import pyqtSignal, Qt, QThread
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, QThread
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QTreeWidget, QDialog, QInputDialog, QApplication,
     QMenu, QAbstractItemView, QTreeWidgetItem
 )
--- a/eric7/Tasks/TasksFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tasks/TasksFile.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import json
 import time

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Templates/TemplateMultipleVariablesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Templates/TemplateMultipleVariablesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for entering multiple template variables.
 """

-from PyQt5.QtCore import QSize, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QSize, Qt
+from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QLineEdit, QPushButton,
     QTextEdit, QDialog, QScrollArea, QFrame, QGridLayout, QVBoxLayout, QLabel
 )
@@ -55,8 +55,7 @@
         self.variablesEntries = {}
         for row, var in enumerate(variables):
             label = QLabel("{0}:".format(var), self.top)
-            self.grid.addWidget(label, row, 0,
-                                Qt.Alignment(Qt.AlignmentFlag.AlignTop))
+            self.grid.addWidget(label, row, 0, Qt.AlignmentFlag.AlignTop)
             if var.find(":") >= 0:
                 formatStr = var[1:-1].split(":")[1]
                 if formatStr in ["ml", "rl"]:
--- a/eric7/Templates/TemplatePropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Templates/TemplatePropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the templates properties dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QRegularExpression
-from PyQt5.QtGui import QRegularExpressionValidator
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt, QRegularExpression
+from PyQt6.QtGui import QRegularExpressionValidator
+from PyQt6.QtWidgets import QDialog

 from .Ui_TemplatePropertiesDialog import Ui_TemplatePropertiesDialog
--- a/eric7/Templates/TemplateSingleVariableDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Templates/TemplateSingleVariableDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog for entering a single template variable.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_TemplateSingleVariableDialog import Ui_TemplateSingleVariableDialog
--- a/eric7/Templates/TemplateViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Templates/TemplateViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import re

-from PyQt5.QtCore import QFile, QFileInfo, QIODevice, Qt, QCoreApplication
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QFile, QFileInfo, QIODevice, Qt, QCoreApplication
+from PyQt6.QtWidgets import (
     QTreeWidget, QDialog, QApplication, QMenu, QTreeWidgetItem
 )
--- a/eric7/Templates/TemplatesFile.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Templates/TemplatesFile.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import time
 import typing

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from E5Gui import E5MessageBox
 from E5Gui.E5OverrideCursor import E5OverridenCursor
--- a/eric7/Toolbox/SingleApplication.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Toolbox/SingleApplication.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import json

-from PyQt5.QtCore import QByteArray
-from PyQt5.QtNetwork import QLocalServer, QLocalSocket
+from PyQt6.QtCore import QByteArray
+from PyQt6.QtNetwork import QLocalServer, QLocalSocket

 from E5Gui import E5MessageBox
--- a/eric7/Toolbox/Startup.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Toolbox/Startup.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import sys

-from PyQt5.QtCore import QTranslator, QLocale, QLibraryInfo, QDir
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtCore import QTranslator, QLocale, QLibraryInfo, QDir
+from PyQt6.QtWidgets import QApplication

 from E5Gui.E5Application import E5Application

@@ -265,8 +265,8 @@

     qtTransDir = Preferences.getQtTranslationsDir()
     if not qtTransDir:
-        qtTransDir = QLibraryInfo.location(
-            QLibraryInfo.LibraryLocation.TranslationsPath)
+        qtTransDir = QLibraryInfo.path(
+            QLibraryInfo.LibraryPath.TranslationsPath)
     loadTranslators(qtTransDir, app, ("qscintilla",))
     # qscintilla needed for web browser
--- a/eric7/Tools/TRPreviewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tools/TRPreviewer.py	Sun May 16 20:07:24 2021 +0200
@@ -10,16 +10,16 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QDir, QTimer, QFileInfo, pyqtSignal, QEvent, QSize, QTranslator, QObject,
     Qt, QCoreApplication
 )
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QWhatsThis, QMdiArea,
-    QApplication, QComboBox, QVBoxLayout, QAction, QLabel
+    QApplication, QComboBox, QVBoxLayout, QLabel
 )
-from PyQt5 import uic
+from PyQt6 import uic


 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/Tools/TRSingleApplication.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tools/TRSingleApplication.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal
+from PyQt6.QtCore import pyqtSignal

 from Toolbox.SingleApplication import (
     SingleApplicationClient, SingleApplicationServer
--- a/eric7/Tools/TrayStarter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tools/TrayStarter.py	Sun May 16 20:07:24 2021 +0200
@@ -11,9 +11,9 @@
 import os
 import contextlib

-from PyQt5.QtCore import QProcess, QSettings, QFileInfo
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QSystemTrayIcon, QMenu, QDialog, QApplication
+from PyQt6.QtCore import QProcess, QSettings, QFileInfo
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import QSystemTrayIcon, QMenu, QDialog, QApplication

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
@@ -522,12 +522,12 @@
         """
         Private slot to handle the Versions dialog.
         """
-        from PyQt5.QtCore import qVersion, PYQT_VERSION_STR
-        from PyQt5.Qsci import QSCINTILLA_VERSION_STR
+        from PyQt6.QtCore import qVersion, PYQT_VERSION_STR
+        from PyQt6.Qsci import QSCINTILLA_VERSION_STR

         try:
             try:
-                from PyQt5 import sip
+                from PyQt6 import sip
             except ImportError:
                 import sip
             sip_version_str = sip.SIP_VERSION_STR
--- a/eric7/Tools/UIPreviewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tools/UIPreviewer.py	Sun May 16 20:07:24 2021 +0200
@@ -9,15 +9,15 @@

 import contextlib

-from PyQt5.QtCore import QDir, QFileInfo, QEvent, QSize, Qt
-from PyQt5.QtGui import QKeySequence, QImageWriter, QPainter
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import QDir, QFileInfo, QEvent, QSize, Qt
+from PyQt6.QtGui import QAction, QKeySequence, QImageWriter, QPainter
+from PyQt6.QtWidgets import (
     QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QWhatsThis, QDialog,
     QScrollArea, QApplication, QStyleFactory, QFrame, QMainWindow,
-    QComboBox, QVBoxLayout, QAction, QLabel
+    QComboBox, QVBoxLayout, QLabel
 )
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
-from PyQt5 import uic
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6 import uic


 from E5Gui import E5MessageBox, E5FileDialog
@@ -545,7 +545,7 @@
         """
         Private slot to handle the Print Preview menu action.
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog

         if self.mainWidget is None:
             E5MessageBox.critical(
--- a/eric7/Tools/webBrowserSupport.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Tools/webBrowserSupport.py	Sun May 16 20:07:24 2021 +0200
@@ -17,7 +17,7 @@
 variant = "None"

 with contextlib.suppress(ImportError):
-    from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
     variant = "QtWebEngine"

 print(variant)      # __IGNORE_WARNING_M801__
--- a/eric7/UI/AuthenticationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/AuthenticationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the authentication dialog for the help browser.
 """

-from PyQt5.QtWidgets import QDialog, QStyle
+from PyQt6.QtWidgets import QDialog, QStyle

 from .Ui_AuthenticationDialog import Ui_AuthenticationDialog
--- a/eric7/UI/Browser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/Browser.py	Sun May 16 20:07:24 2021 +0200
@@ -10,13 +10,13 @@
 import os
 import shutil

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QUrl, QCoreApplication, QItemSelectionModel,
     QModelIndex, QElapsedTimer
 )
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import (
-    QTreeView, QApplication, QMenu, QAbstractItemView, QAction, QInputDialog,
+from PyQt6.QtGui import QAction, QDesktopServices
+from PyQt6.QtWidgets import (
+    QTreeView, QApplication, QMenu, QAbstractItemView, QInputDialog,
     QLineEdit, QDialog
 )

@@ -356,7 +356,7 @@

         @param mouseEvent the mouse event (QMouseEvent)
         """
-        index = self.indexAt(mouseEvent.pos())
+        index = self.indexAt(mouseEvent.position().toPoint())
         if index.isValid():
             itm = self.model().item(index)
             if isinstance(itm, (
@@ -385,9 +385,10 @@

             if index.isValid():
                 self.setCurrentIndex(index)
-                flags = QItemSelectionModel.SelectionFlags(
+                flags = (
                     QItemSelectionModel.SelectionFlag.ClearAndSelect |
-                    QItemSelectionModel.SelectionFlag.Rows)
+                    QItemSelectionModel.SelectionFlag.Rows
+                )
                 self.selectionModel().select(index, flags)

                 itm = self.model().item(index)
--- a/eric7/UI/BrowserModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/BrowserModel.py	Sun May 16 20:07:24 2021 +0200
@@ -12,12 +12,12 @@
 import json
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QDir, QModelIndex, QAbstractItemModel, QFileSystemWatcher, Qt, QProcess,
     QCoreApplication
 )
-from PyQt5.QtGui import QImageReader, QFont
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtGui import QImageReader, QFont
+from PyQt6.QtWidgets import QApplication

 import UI.PixmapCache
 import Preferences
@@ -321,8 +321,7 @@
             # just ignore the situation we don't have a reference to the item
             return

-        dirFilter = QDir.Filters(QDir.Filter.AllEntries |
-                                 QDir.Filter.NoDotAndDotDot)
+        dirFilter = QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot

         for itm in self.watchedItems[path]:
             oldCnt = itm.childCount()
@@ -554,9 +553,8 @@

         qdir = QDir(parentItem.dirName())

-        dirFilter = QDir.Filters(
-            QDir.Filter.AllEntries |
-            QDir.Filter.NoDotAndDotDot)
+        dirFilter = (QDir.Filter.AllEntries |
+                     QDir.Filter.NoDotAndDotDot)
         entryInfoList = qdir.entryInfoList(dirFilter)
         if len(entryInfoList) > 0:
             if repopulate:
--- a/eric7/UI/BrowserSortFilterProxyModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/BrowserSortFilterProxyModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QModelIndex, QSortFilterProxyModel
+from PyQt6.QtCore import QModelIndex, QSortFilterProxyModel

 import Preferences
--- a/eric7/UI/ClearPrivateDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/ClearPrivateDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select which private data to clear.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_ClearPrivateDataDialog import Ui_ClearPrivateDataDialog
--- a/eric7/UI/CodeDocumentationViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/CodeDocumentationViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -8,9 +8,9 @@
 plug-ins.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QTimer
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QTimer
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QSizePolicy,
     QLineEdit, QTextBrowser, QToolTip
 )
@@ -79,7 +79,7 @@
         self.__verticalLayout.setContentsMargins(0, 0, 0, 0)

         try:
-            from PyQt5.QtWebEngineWidgets import (
+            from PyQt6.QtWebEngineWidgets import (
                 QWebEngineView, QWebEngineSettings
             )
             self.__contents = QWebEngineView(self)
--- a/eric7/UI/CodeDocumentationViewerTemplate.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/CodeDocumentationViewerTemplate.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 from E5Gui.E5Application import e5App
--- a/eric7/UI/CompareDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/CompareDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,9 +11,9 @@
 import re
 from difflib import _mdiff, IS_CHARACTER_JUNK

-from PyQt5.QtCore import QTimer, QEvent, pyqtSlot
-from PyQt5.QtGui import QFontMetrics, QBrush, QTextCursor
-from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox
+from PyQt6.QtCore import QTimer, QEvent, pyqtSlot
+from PyQt6.QtGui import QFontMetrics, QBrush, QTextCursor
+from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox

 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
--- a/eric7/UI/CompareDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/CompareDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -111,8 +111,8 @@
        <property name="readOnly">
         <bool>true</bool>
        </property>
-       <property name="tabStopWidth">
-        <number>8</number>
+       <property name="tabStopDistance">
+        <double>8.000000000000000</double>
        </property>
        <property name="acceptRichText">
         <bool>false</bool>
@@ -203,8 +203,8 @@
        <property name="readOnly">
         <bool>true</bool>
        </property>
-       <property name="tabStopWidth">
-        <number>8</number>
+       <property name="tabStopDistance">
+        <double>8.000000000000000</double>
        </property>
        <property name="acceptRichText">
         <bool>false</bool>
--- a/eric7/UI/Config.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/Config.py	Sun May 16 20:07:24 2021 +0200
@@ -7,6 +7,6 @@
 Module defining common data to be used by all windows..
 """

-from PyQt5.QtCore import QSize
+from PyQt6.QtCore import QSize

 ToolBarIconSize = QSize(20, 18)
--- a/eric7/UI/DeleteFilesConfirmationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/DeleteFilesConfirmationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to confirm deletion of multiple files.
 """

-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_DeleteFilesConfirmationDialog import Ui_DeleteFilesConfirmationDialog
--- a/eric7/UI/DiffDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/DiffDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import contextlib
 from difflib import unified_diff, context_diff

-from PyQt5.QtCore import QFileInfo, QEvent, pyqtSlot
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox
+from PyQt6.QtCore import QFileInfo, QEvent, pyqtSlot
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5MainWindow import E5MainWindow
--- a/eric7/UI/DiffDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/DiffDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -143,8 +143,8 @@
      <property name="readOnly">
       <bool>true</bool>
      </property>
-     <property name="tabStopWidth">
-      <number>8</number>
+     <property name="tabStopDistance">
+      <double>8.000000000000000</double>
      </property>
     </widget>
    </item>
--- a/eric7/UI/EmailDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/EmailDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 import smtplib
 import contextlib

-from PyQt5.QtCore import Qt, pyqtSlot
-from PyQt5.QtGui import QTextOption
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtGui import QTextOption
+from PyQt6.QtWidgets import (
     QHeaderView, QLineEdit, QDialog, QInputDialog, QDialogButtonBox,
     QTreeWidgetItem
 )
--- a/eric7/UI/EmailDialog.ui	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/EmailDialog.ui	Sun May 16 20:07:24 2021 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>EmailDialog</class>
- <widget class="QDialog" name="EmailDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="EmailDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,38 +10,38 @@
     <height>547</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Send bug report</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QSplitter" name="mainSplitter" >
-     <property name="orientation" >
+    <widget class="QSplitter" name="mainSplitter">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <widget class="QGroupBox" name="messageGroup" >
-      <property name="title" >
+     <widget class="QGroupBox" name="messageGroup">
+      <property name="title">
        <string>Message</string>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout" >
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <layout class="QHBoxLayout" >
+        <layout class="QHBoxLayout">
          <item>
-          <widget class="QLabel" name="textLabel1" >
-           <property name="text" >
+          <widget class="QLabel" name="textLabel1">
+           <property name="text">
             <string>&amp;Subject:</string>
            </property>
-           <property name="buddy" >
+           <property name="buddy">
             <cstring>subject</cstring>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="subject" >
-           <property name="toolTip" >
+          <widget class="QLineEdit" name="subject">
+           <property name="toolTip">
             <string>Enter the subject</string>
            </property>
           </widget>
@@ -48,110 +49,110 @@
         </layout>
        </item>
        <item>
-        <widget class="QLabel" name="msgLabel" >
-         <property name="buddy" >
+        <widget class="QLabel" name="msgLabel">
+         <property name="buddy">
           <cstring>message</cstring>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QTextEdit" name="message" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+        <widget class="QTextEdit" name="message">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="lineWrapMode" >
+         <property name="lineWrapMode">
           <enum>QTextEdit::FixedColumnWidth</enum>
          </property>
-         <property name="lineWrapColumnOrWidth" >
+         <property name="lineWrapColumnOrWidth">
           <number>70</number>
          </property>
-         <property name="tabStopWidth" >
-          <number>8</number>
+         <property name="tabStopDistance">
+          <double>8.000000000000000</double>
          </property>
-         <property name="acceptRichText" >
+         <property name="acceptRichText">
           <bool>false</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QGroupBox" name="attachmentsGroup" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+     <widget class="QGroupBox" name="attachmentsGroup">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="title" >
+      <property name="title">
        <string>Attachments</string>
       </property>
-      <layout class="QGridLayout" name="gridLayout" >
-       <item row="0" column="0" >
-        <widget class="QTreeWidget" name="attachments" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <widget class="QTreeWidget" name="attachments">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="alternatingRowColors" >
+         <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
-         <property name="rootIsDecorated" >
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Name</string>
           </property>
          </column>
          <column>
-          <property name="text" >
+          <property name="text">
            <string>Type</string>
           </property>
          </column>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <layout class="QVBoxLayout" >
+       <item row="0" column="1">
+        <layout class="QVBoxLayout">
          <item>
-          <widget class="QPushButton" name="addButton" >
-           <property name="toolTip" >
+          <widget class="QPushButton" name="addButton">
+           <property name="toolTip">
             <string>Press to add an attachment</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>&amp;Add...</string>
            </property>
-           <property name="shortcut" >
+           <property name="shortcut">
             <string>Alt+A</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="deleteButton" >
-           <property name="toolTip" >
+          <widget class="QPushButton" name="deleteButton">
+           <property name="toolTip">
             <string>Delete the selected entry from the list of attachments</string>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>&amp;Delete</string>
            </property>
-           <property name="shortcut" >
+           <property name="shortcut">
             <string>Alt+D</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeType" >
+           <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>16</height>
@@ -166,11 +167,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
--- a/eric7/UI/ErrorLogDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/ErrorLogDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QStyle
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QStyle

 from .Ui_ErrorLogDialog import Ui_ErrorLogDialog
--- a/eric7/UI/FindFileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/FindFileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import os
 import re

-from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import (
     QDialog, QApplication, QMenu, QDialogButtonBox, QTreeWidgetItem, QComboBox
 )
--- a/eric7/UI/FindFileNameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/FindFileNameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import sys

-from PyQt5.QtCore import pyqtSignal, pyqtSlot
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import (
     QWidget, QHeaderView, QApplication, QDialogButtonBox, QTreeWidgetItem
 )
--- a/eric7/UI/InstallInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/InstallInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import json
 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui import E5MessageBox
--- a/eric7/UI/LogView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/LogView.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the log viewer widget and the log widget.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QRegularExpression
-from PyQt5.QtGui import QBrush, QTextCursor, QTextDocument
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, QRegularExpression
+from PyQt6.QtGui import QBrush, QTextCursor, QTextDocument
+from PyQt6.QtWidgets import (
     QTextEdit, QApplication, QMenu, QWidget, QHBoxLayout, QSizePolicy
 )
--- a/eric7/UI/NotificationWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/NotificationWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import contextlib
 import enum

-from PyQt5.QtCore import Qt, QTimer, QPoint
-from PyQt5.QtWidgets import QFrame, QWidget, QVBoxLayout
+from PyQt6.QtCore import Qt, QTimer, QPoint
+from PyQt6.QtWidgets import QFrame, QWidget, QVBoxLayout

 from .Ui_NotificationFrame import Ui_NotificationFrame

@@ -203,7 +203,7 @@
                 screen = self.screen()
             except AttributeError:
                 # < Qt 5.15
-                from PyQt5.QtGui import QGuiApplication
+                from PyQt6.QtGui import QGuiApplication
                 screen = QGuiApplication.screenAt(pos)
             screenGeom = screen.geometry()

@@ -254,7 +254,7 @@
         @param evt reference to the mouse event (QMouseEvent)
         """
         if not self.__settingPosition:
-            clickedLabel = self.childAt(evt.pos())
+            clickedLabel = self.childAt(evt.position().toPoint())
             if clickedLabel:
                 clickedNotification = clickedLabel.parent()
                 self.__removeNotification(clickedNotification)
--- a/eric7/UI/NumbersWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/NumbersWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a widget to show numbers in different formats.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel
-from PyQt5.QtWidgets import QWidget, QHeaderView
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel
+from PyQt6.QtWidgets import QWidget, QHeaderView

 from E5Gui.E5Application import e5App
--- a/eric7/UI/PixmapCache.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/PixmapCache.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QPixmap, QIcon, QPainter
+from PyQt6.QtCore import Qt, QSize
+from PyQt6.QtGui import QPixmap, QIcon, QPainter


 class PixmapCache:
--- a/eric7/UI/Previewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/Previewer.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QTimer
-from PyQt5.QtWidgets import QStackedWidget
+from PyQt6.QtCore import pyqtSlot, QTimer
+from PyQt6.QtWidgets import QStackedWidget

 import Preferences
--- a/eric7/UI/Previewers/PreviewerHTML.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/Previewers/PreviewerHTML.py	Sun May 16 20:07:24 2021 +0200
@@ -16,9 +16,9 @@
 import io
 import contextlib

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QThread
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QThread
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QLabel, QCheckBox, QSizePolicy, QToolTip
 )

@@ -51,7 +51,7 @@
         self.__previewAvailable = True

         try:
-            from PyQt5.QtWebEngineWidgets import QWebEngineView
+            from PyQt6.QtWebEngineWidgets import QWebEngineView
             self.previewView = QWebEngineView(self)
             self.previewView.page().linkHovered.connect(self.__showLink)
         except ImportError:
@@ -263,7 +263,7 @@
         """
         Private method to save scroll bar positions for a previewed editor.
         """
-        from PyQt5.QtCore import QPoint
+        from PyQt6.QtCore import QPoint
         try:
             pos = self.previewView.scrollPosition()
         except AttributeError:
@@ -303,7 +303,7 @@
         @return result of the script
         @rtype depending upon script result
         """
-        from PyQt5.QtCore import QEventLoop
+        from PyQt6.QtCore import QEventLoop
         loop = QEventLoop()
         resultDict = {"res": None}
--- a/eric7/UI/Previewers/PreviewerQSS.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/Previewers/PreviewerQSS.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QWidget, QMenu, QLabel, QHeaderView, QListWidgetItem
 )
--- a/eric7/UI/PythonAstViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/PythonAstViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@

 import ast

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer
-from PyQt5.QtGui import QBrush
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtGui import QBrush
+from PyQt6.QtWidgets import (
     QTreeWidget, QTreeWidgetItem, QAbstractItemView, QWidget, QVBoxLayout
 )
--- a/eric7/UI/PythonDisViewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/PythonDisViewer.py	Sun May 16 20:07:24 2021 +0200
@@ -14,9 +14,9 @@
 import enum


-from PyQt5.QtCore import pyqtSlot, Qt, QTimer
-from PyQt5.QtGui import QBrush
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtGui import QBrush
+from PyQt6.QtWidgets import (
     QTreeWidgetItem, QAbstractItemView, QWidget, QMenu
 )
--- a/eric7/UI/SearchWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/SearchWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the search box for the shell and log viewer.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt5.QtWidgets import QWidget, QSpacerItem, QSizePolicy
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
+from PyQt6.QtWidgets import QWidget, QSpacerItem, QSizePolicy

 import UI.PixmapCache
--- a/eric7/UI/SplashScreen.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/SplashScreen.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import os.path
 import logging

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QPixmap, QColor
-from PyQt5.QtWidgets import QApplication, QSplashScreen
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPixmap, QColor
+from PyQt6.QtWidgets import QApplication, QSplashScreen

 from eric7config import getConfig

@@ -27,14 +27,14 @@
         """
         ericPic = QPixmap(
             os.path.join(getConfig('ericPixDir'), 'ericSplash.png'))
-        self.labelAlignment = Qt.Alignment(
+        self.labelAlignment = (
             Qt.AlignmentFlag.AlignBottom |
             Qt.AlignmentFlag.AlignRight |
             Qt.AlignmentFlag.AlignAbsolute
         )
         super().__init__(ericPic)
         self.show()
-        QApplication.flush()
+        QApplication.processEvents()

     def showMessage(self, msg):
         """
--- a/eric7/UI/SymbolsWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/SymbolsWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -11,12 +11,12 @@
 import unicodedata
 import html.entities

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, QAbstractTableModel, QModelIndex, Qt,
     QItemSelectionModel, QLocale
 )
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QWidget, QHeaderView, QAbstractItemView
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QWidget, QHeaderView, QAbstractItemView

 from .Ui_SymbolsWidget import Ui_SymbolsWidget

@@ -374,12 +374,12 @@
                 return unicodedata.name(chr(symbolId), '').title()

         if (
-            role == Qt.ItemDataRole.BackgroundColorRole and
+            role == Qt.ItemDataRole.BackgroundRole and
             index.column() == 0
         ):
             return QColor(Qt.GlobalColor.lightGray)

-        if role == Qt.ItemDataRole.TextColorRole:
+        if role == Qt.ItemDataRole.ForegroundRole:
             char = chr(symbolId)
             if self.__isDigit(char):
                 return QColor(Qt.GlobalColor.darkBlue)
--- a/eric7/UI/UserInterface.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sun May 16 20:07:24 2021 +0200
@@ -17,18 +17,18 @@
 import functools
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate,
     QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt, QUuid, QThread,
     QUrlQuery
 )
-from PyQt5.QtGui import QKeySequence, QDesktopServices
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QAction, QKeySequence, QDesktopServices
+from PyQt6.QtWidgets import (
     QSizePolicy, QWidget, QWhatsThis, QToolBar, QDialog, QSplitter,
-    QApplication, QMenu, QVBoxLayout, QDockWidget, QAction, QLabel
+    QApplication, QMenu, QVBoxLayout, QDockWidget, QLabel
 )
-from PyQt5.Qsci import QSCINTILLA_VERSION_STR
-from PyQt5.QtNetwork import (
+from PyQt6.Qsci import QSCINTILLA_VERSION_STR
+from PyQt6.QtNetwork import (
     QNetworkProxyFactory, QNetworkAccessManager, QNetworkRequest, QNetworkReply
 )

@@ -614,7 +614,7 @@
             e5App().registerObject("MicroPython", self.microPythonWidget)

         # list of web addresses serving the versions file
-        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
+        self.__httpAlternatives = Preferences.getUI("VersionsUrls7")
         self.__inVersionCheck = False
         self.__versionCheckProgress = None

@@ -1562,11 +1562,9 @@
         dock = QDockWidget()
         dock.setObjectName(name)
         dock.setFeatures(
-            QDockWidget.DockWidgetFeatures(
-                QDockWidget.DockWidgetFeature.DockWidgetClosable |
-                QDockWidget.DockWidgetFeature.DockWidgetMovable |
-                QDockWidget.DockWidgetFeature.DockWidgetFloatable
-            )
+            QDockWidget.DockWidgetFeature.DockWidgetClosable |
+            QDockWidget.DockWidgetFeature.DockWidgetMovable |
+            QDockWidget.DockWidgetFeature.DockWidgetFloatable
         )
         return dock

@@ -3736,7 +3734,7 @@
         """
         try:
             try:
-                from PyQt5 import sip
+                from PyQt6 import sip
             except ImportError:
                 import sip
             sip_version_str = sip.SIP_VERSION_STR
@@ -3758,12 +3756,12 @@
             """<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""
         ).format(PYQT_VERSION_STR)
         with contextlib.suppress(ImportError, AttributeError):
-            from PyQt5 import QtChart
+            from PyQt6 import QtChart
             versionText += (
                 """<tr><td><b>PyQtChart</b></td><td>{0}</td></tr>"""
             ).format(QtChart.PYQT_CHART_VERSION_STR)
         with contextlib.suppress(ImportError, AttributeError):
-            from PyQt5 import QtWebEngine
+            from PyQt6 import QtWebEngine
             versionText += (
                 """<tr><td><b>PyQtWebEngine</b></td><td>{0}</td></tr>"""
             ).format(QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
@@ -6185,7 +6183,7 @@
             else:
                 self.__setWindowCaption(editor="")

-        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
+        self.__httpAlternatives = Preferences.getUI("VersionsUrls7")
         self.performVersionCheck(False)

         from QScintilla.SpellChecker import SpellChecker
@@ -7182,7 +7180,7 @@
                 urls.append(versions[line])
                 line += 1

-            Preferences.setUI("VersionsUrls6", urls)
+            Preferences.setUI("VersionsUrls7", urls)

     def __versionCheckResult(self, versions):
         """
--- a/eric7/Utilities/AutoSaver.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/AutoSaver.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing an auto saver class.
 """

-from PyQt5.QtCore import QObject, QBasicTimer, QTime
+from PyQt6.QtCore import QObject, QBasicTimer, QTime


 class AutoSaver(QObject):
@@ -33,16 +33,16 @@
         self.__save = save

         self.__timer = QBasicTimer()
-        self.__firstChange = QTime()
+        self.__firstChange = None

     def changeOccurred(self):
         """
         Public slot handling a change.
         """
-        if self.__firstChange.isNull():
-            self.__firstChange.start()
+        if self.__firstChange is None:
+            self.__firstChange = QTime.currentTime()

-        if self.__firstChange.elapsed() > self.MAXWAIT:
+        if self.__firstChange.msecsTo(QTime.currentTime()) > self.MAXWAIT:
             self.saveIfNeccessary()
         else:
             self.__timer.start(self.AUTOSAVE_IN, self)
@@ -66,5 +66,5 @@
             return

         self.__timer.stop()
-        self.__firstChange = QTime()
+        self.__firstChange = None
         self.__save()
--- a/eric7/Utilities/BackgroundService.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/BackgroundService.py	Sun May 16 20:07:24 2021 +0200
@@ -15,9 +15,9 @@
 from zlib import adler32
 import contextlib

-from PyQt5.QtCore import QProcess, pyqtSignal, QTimer
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtNetwork import QTcpServer, QHostAddress
+from PyQt6.QtCore import QProcess, pyqtSignal, QTimer
+from PyQt6.QtWidgets import QApplication
+from PyQt6.QtNetwork import QTcpServer, QHostAddress

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/Utilities/FtpUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/FtpUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QObject, QDate, QDateTime, QTime
+from PyQt6.QtCore import QObject, QDate, QDateTime, QTime

 from E5Network.E5UrlInfo import E5UrlInfo, E5UrlPermission
--- a/eric7/Utilities/MouseUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/MouseUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing utility functions related to Mouse stuff.
 """

-from PyQt5.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import Qt, QCoreApplication

 import Globals

@@ -48,7 +48,7 @@
         "MouseUtilities", "Left Button"),
     Qt.MouseButton.RightButton: QCoreApplication.translate(
         "MouseUtilities", "Right Button"),
-    Qt.MouseButton.MidButton: QCoreApplication.translate(
+    Qt.MouseButton.MiddleButton: QCoreApplication.translate(
         "MouseUtilities", "Middle Button"),
     Qt.MouseButton.XButton1: QCoreApplication.translate(
         "MouseUtilities", "Extra Button 1"),
--- a/eric7/Utilities/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -43,11 +43,11 @@

 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     qVersion, PYQT_VERSION_STR, QDir, QProcess, QByteArray, QCoreApplication,
     QCryptographicHash
 )
-from PyQt5.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla
+from PyQt6.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla

 # import these methods into the Utilities namespace
 from Globals import (  # __IGNORE_WARNING__
@@ -1844,7 +1844,7 @@
     """
     try:
         try:
-            from PyQt5 import sip
+            from PyQt6 import sip
         except ImportError:
             import sip
         sip_version_str = sip.SIP_VERSION_STR
@@ -1859,12 +1859,12 @@
     info.append("  Qt {0}".format(qVersion()))
     info.append("  PyQt {0}".format(PYQT_VERSION_STR))
     try:
-        from PyQt5 import QtChart
+        from PyQt6 import QtChart
         info.append("  PyQtChart {0}".format(QtChart.PYQT_CHART_VERSION_STR))
     except (ImportError, AttributeError):
         info.append("  PyQtChart not installed")
     try:
-        from PyQt5 import QtWebEngine
+        from PyQt6 import QtWebEngine
         info.append("  PyQtWebEngine {0}".format(
             QtWebEngine.PYQT_WEBENGINE_VERSION_STR))
     except (ImportError, AttributeError):
@@ -1872,7 +1872,7 @@
     info.append("  QScintilla {0}".format(QSCINTILLA_VERSION_STR))
     info.append("  sip {0}".format(sip_version_str))
     with contextlib.suppress(ImportError):
-        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
         from WebBrowser.Tools import WebBrowserTools
         chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
         info.append("  WebEngine {0}".format(chromeVersion))
--- a/eric7/Utilities/crypto/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/crypto/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import random
 import base64

-from PyQt5.QtCore import QCoreApplication
-from PyQt5.QtWidgets import QLineEdit, QInputDialog
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QLineEdit, QInputDialog

 from E5Gui import E5MessageBox
--- a/eric7/Utilities/uic.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/uic.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 directory or directory tree.
 """

-from PyQt5.uic import compileUiDir
+from PyQt6.uic import compileUiDir


 def __pyName(py_dir, py_file):
--- a/eric7/VCS/CommandOptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/CommandOptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the VCS command options dialog.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_CommandOptionsDialog import Ui_VcsCommandOptionsDialog
--- a/eric7/VCS/ProjectBrowserHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/ProjectBrowserHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import QObject, QCoreApplication
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5Application import e5App
--- a/eric7/VCS/ProjectHelper.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/ProjectHelper.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import shutil
 import copy

-from PyQt5.QtCore import pyqtSlot, QDir, QFileInfo, QObject, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QInputDialog, QToolBar
+from PyQt6.QtCore import pyqtSlot, QDir, QFileInfo, QObject, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QInputDialog, QToolBar

 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox
--- a/eric7/VCS/RepositoryInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/RepositoryInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implemting a dialog to show repository information.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog
--- a/eric7/VCS/StatusMonitorLed.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/StatusMonitorLed.py	Sun May 16 20:07:24 2021 +0200
@@ -8,9 +8,9 @@
 thread.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QWidget, QInputDialog, QMenu, QHBoxLayout, QLabel
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QWidget, QInputDialog, QMenu, QHBoxLayout, QLabel

 from E5Gui.E5Led import E5ClickableLed, E5LedType
--- a/eric7/VCS/StatusMonitorThread.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/StatusMonitorThread.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QThread, QMutex, QWaitCondition, pyqtSignal, QCoreApplication
 )
--- a/eric7/VCS/VersionControl.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VCS/VersionControl.py	Sun May 16 20:07:24 2021 +0200
@@ -11,10 +11,10 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QObject, QThread, QMutex, QProcess, Qt, pyqtSignal, QCoreApplication
 )
-from PyQt5.QtWidgets import QApplication
+from PyQt6.QtWidgets import QApplication

 from E5Gui import E5MessageBox
--- a/eric7/ViewManager/BookmarkedFilesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/ViewManager/BookmarkedFilesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a configuration dialog for the bookmarked files menu.
 """

-from PyQt5.QtCore import QFileInfo, Qt, pyqtSlot
-from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtCore import QFileInfo, Qt, pyqtSlot
+from PyQt6.QtGui import QColor
+from PyQt6.QtWidgets import QListWidgetItem, QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/ViewManager/ViewManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/ViewManager/ViewManager.py	Sun May 16 20:07:24 2021 +0200
@@ -11,15 +11,15 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QSignalMapper, QTimer, QFileInfo, QPoint,
     QCoreApplication
 )
-from PyQt5.QtGui import QKeySequence, QPixmap
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QKeySequence, QPixmap
+from PyQt6.QtWidgets import (
     QToolBar, QDialog, QApplication, QMenu, QWidget
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla

 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -1447,11 +1447,7 @@
         ####################################################################

         self.esm = QSignalMapper(self)
-        try:
-            self.alignMapper.mappedInt.connect(self.__editorCommand)
-        except AttributeError:
-            # pre Qt 5.15
-            self.esm.mapped[int].connect(self.__editorCommand)
+        self.esm.mappedInt.connect(self.__editorCommand)

         self.editorActGrp = createActionGroup(self.editActGrp)

@@ -3315,8 +3311,9 @@
         tb.addAction(self.gotoLastEditAct)

         tb.setAllowedAreas(
-            Qt.ToolBarAreas(Qt.ToolBarArea.TopToolBarArea |
-                            Qt.ToolBarArea.BottomToolBarArea))
+            Qt.ToolBarArea.TopToolBarArea |
+            Qt.ToolBarArea.BottomToolBarArea
+        )

         toolbarManager.addToolBar(tb, tb.windowTitle())
         toolbarManager.addAction(self.gotoAct, tb.windowTitle())
--- a/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import os
 import sys

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 import sys
 import re

-from PyQt5.QtCore import pyqtSlot, QProcess, QTimer
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/VirtualEnv/VirtualenvExecDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvExecDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import sys
 import os

-from PyQt5.QtCore import QProcess, QTimer, QUrl
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import QProcess, QTimer, QUrl
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog
--- a/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/VirtualEnv/VirtualenvManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManager.py	Sun May 16 20:07:24 2021 +0200
@@ -13,8 +13,8 @@
 import json
 import copy

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App
--- a/eric7/VirtualEnv/VirtualenvManagerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManagerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 environments.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/VirtualEnv/VirtualenvNameDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvNameDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 environment.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_VirtualenvNameDialog import Ui_VirtualenvNameDialog
--- a/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the AdBlock configuration dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
-from PyQt5.QtWidgets import QDialog, QMenu, QToolButton
+from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
+from PyQt6.QtWidgets import QDialog, QMenu, QToolButton

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to configure the AdBlock exceptions.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog

 from .Ui_AdBlockExceptionsDialog import Ui_AdBlockExceptionsDialog
--- a/eric7/WebBrowser/AdBlock/AdBlockIcon.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockIcon.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,9 @@
 Module implementing the AdBlock icon for the main window status bar.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QAction, QMenu
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5ClickableLabel import E5ClickableLabel

@@ -94,6 +95,7 @@
             UI.PixmapCache.getIcon("adBlockPlus"),
             self.tr("AdBlock Configuration..."), manager.showDialog)

+    # TODO: change this to return a QMenu
     def menuAction(self):
         """
         Public method to get a reference to the menu action.
@@ -103,6 +105,7 @@
         """
         if not self.__menuAction:
             self.__menuAction = QAction(self.tr("AdBlock"), self)
+            # TODO: replace this obsolete function
             self.__menuAction.setMenu(QMenu())
             self.__menuAction.menu().aboutToShow.connect(
                 lambda: self.__createMenu(self.__menuAction.menu()))
--- a/eric7/WebBrowser/AdBlock/AdBlockManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QUrl, QUrlQuery, QFile, QByteArray, QMutex
 )
-from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo
+from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/AdBlock/AdBlockMatcher.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockMatcher.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the AdBlock matcher.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from .AdBlockSearchTree import AdBlockSearchTree
 from .AdBlockRule import AdBlockRule, AdBlockRuleOption
--- a/eric7/WebBrowser/AdBlock/AdBlockPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to apply AdBlock rules to a web page.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject

 from ..Tools import Scripts
 from ..WebBrowserPage import WebBrowserPage
--- a/eric7/WebBrowser/AdBlock/AdBlockRule.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockRule.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 from enum import IntEnum

-from PyQt5.QtCore import Qt
-from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo
+from PyQt6.QtCore import Qt
+from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo


 def toSecondLevelDomain(url):
--- a/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Sun May 16 20:07:24 2021 +0200
@@ -12,11 +12,11 @@
 import hashlib
 import base64

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, QUrlQuery,
     QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime
 )
-from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a tree widget for the AdBlock configuration dialog.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QFont, QColor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QFont, QColor
+from PyQt6.QtWidgets import (
     QAbstractItemView, QTreeWidgetItem, QInputDialog, QLineEdit, QMenu,
     QApplication
 )
--- a/eric7/WebBrowser/AutoScroll/AutoScroller.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AutoScroll/AutoScroller.py	Sun May 16 20:07:24 2021 +0200
@@ -12,8 +12,8 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import Qt, QObject, QRect, QEvent, QPoint
-from PyQt5.QtWidgets import QApplication, QLabel
+from PyQt6.QtCore import Qt, QObject, QRect, QEvent, QPoint
+from PyQt6.QtWidgets import QApplication, QLabel

 from .FrameScroller import FrameScroller

@@ -105,7 +105,7 @@
                     middleButton and
                     (self.__view != view or not self.__indicator.isVisible())
                 ):
-                    return self.__showIndicator(view, evt.pos())
+                    return self.__showIndicator(view, evt.position().toPoint())

                 # test for stop
                 if self.__indicator.isVisible():
--- a/eric7/WebBrowser/AutoScroll/FrameScroller.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/AutoScroll/FrameScroller.py	Sun May 16 20:07:24 2021 +0200
@@ -14,7 +14,7 @@

 import math

-from PyQt5.QtCore import pyqtSlot, QObject, QTimer
+from PyQt6.QtCore import pyqtSlot, QObject, QTimer


 class FrameScroller(QObject):
--- a/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to add a bookmark or a bookmark folder.
 """

-from PyQt5.QtCore import QModelIndex, QSortFilterProxyModel
-from PyQt5.QtWidgets import QDialog, QTreeView
+from PyQt6.QtCore import QModelIndex, QSortFilterProxyModel
+from PyQt6.QtWidgets import QDialog, QTreeView

 from .Ui_AddBookmarkDialog import Ui_AddBookmarkDialog
--- a/eric7/WebBrowser/Bookmarks/BookmarkNode.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarkNode.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the bookmark node.
 """

-from PyQt5.QtCore import QDateTime
+from PyQt6.QtCore import QDateTime


 class BookmarkNode:
--- a/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to show and edit bookmark properties.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_BookmarkPropertiesDialog import Ui_BookmarkPropertiesDialog
--- a/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to manage bookmarks.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
-from PyQt5.QtGui import QFontMetrics, QCursor
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
+from PyQt6.QtGui import QFontMetrics, QCursor
+from PyQt6.QtWidgets import (
     QDialog, QMenu, QApplication, QInputDialog, QLineEdit
 )
--- a/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, Qt, QSize
-from PyQt5.QtWidgets import QDialog, QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QSize
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from E5Gui import E5MessageBox
 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a base class for the bookmarks importers.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 class BookmarksImporter(QObject):
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import json

-from PyQt5.QtCore import QCoreApplication, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import sqlite3

-from PyQt5.QtCore import QCoreApplication, QDate, Qt, QUrl
+from PyQt6.QtCore import QCoreApplication, QDate, Qt, QUrl

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QCoreApplication, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QCoreApplication, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QCoreApplication, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import os
 import plistlib

-from PyQt5.QtCore import QCoreApplication, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt

 from .BookmarksImporter import BookmarksImporter
--- a/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Package implementing bookmarks importers for various sources.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication

 import UI.PixmapCache
 import Globals
--- a/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QT_TRANSLATE_NOOP, QObject, QFile, QIODevice, QXmlStreamReader,
-    QDateTime, QFileInfo, QUrl, QCoreApplication
+    QDateTime, QFileInfo, QUrl, QCoreApplication, QUndoStack, QUndoCommand
 )
-from PyQt5.QtWidgets import QUndoStack, QUndoCommand, QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/WebBrowser/Bookmarks/BookmarksMenu.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksMenu.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the bookmarks menu.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QUrl
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtCore import pyqtSignal, Qt, QUrl
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5ModelMenu import E5ModelMenu
--- a/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     Qt, QAbstractItemModel, QModelIndex, QUrl, QByteArray, QDataStream,
     QIODevice, QBuffer, QMimeData
 )
--- a/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a tool bar showing bookmarks.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QCoreApplication
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QMenu
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QCoreApplication
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import QMenu
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 from E5Gui.E5ModelToolBar import E5ModelToolBar
--- a/eric7/WebBrowser/Bookmarks/NsHtmlReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/NsHtmlReader.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import re

-from PyQt5.QtCore import QObject, QIODevice, QFile, QDateTime
+from PyQt6.QtCore import QObject, QIODevice, QFile, QDateTime

 from .BookmarkNode import BookmarkNode
--- a/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write Netscape HTML bookmark files.
 """

-from PyQt5.QtCore import QObject, QIODevice, QFile
+from PyQt6.QtCore import QObject, QIODevice, QFile

 from .BookmarkNode import BookmarkNode
--- a/eric7/WebBrowser/Bookmarks/XbelReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/XbelReader.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to read XBEL bookmark files.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QXmlStreamReader, QXmlStreamEntityResolver, QIODevice, QFile,
     QCoreApplication, QXmlStreamNamespaceDeclaration, QDateTime, Qt
 )
--- a/eric7/WebBrowser/Bookmarks/XbelWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/XbelWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write XBEL bookmark files.
 """

-from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt
+from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt

 from .BookmarkNode import BookmarkNode
--- a/eric7/WebBrowser/ClosedTabsManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/ClosedTabsManager.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to manage closed tabs.
 """

-from PyQt5.QtCore import pyqtSignal, QUrl, QObject
+from PyQt6.QtCore import pyqtSignal, QUrl, QObject


 class ClosedTab:
--- a/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the cookie exceptions model.
 """

-from PyQt5.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
-from PyQt5.QtGui import QFont, QFontMetrics
+from PyQt6.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
+from PyQt6.QtGui import QFont, QFontMetrics


 class CookieExceptionsModel(QAbstractTableModel):
--- a/eric7/WebBrowser/CookieJar/CookieJar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookieJar.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QSettings
-from PyQt5.QtNetwork import QNetworkCookieJar, QNetworkCookie
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QSettings
+from PyQt6.QtNetwork import QNetworkCookieJar, QNetworkCookie

 from WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the cookies configuration dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .CookieJar import CookieJar
--- a/eric7/WebBrowser/CookieJar/CookiesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookiesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show all cookies.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QByteArray
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import pyqtSlot, Qt, QByteArray
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog for the configuration of cookie exceptions.
 """

-from PyQt5.QtCore import pyqtSlot, QSortFilterProxyModel
-from PyQt5.QtGui import QFont, QFontMetrics
-from PyQt5.QtWidgets import QDialog, QCompleter
+from PyQt6.QtCore import pyqtSlot, QSortFilterProxyModel
+from PyQt6.QtGui import QFont, QFontMetrics
+from PyQt6.QtWidgets import QDialog, QCompleter

 from .CookieExceptionsModel import CookieExceptionsModel
--- a/eric7/WebBrowser/Download/DownloadAskActionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadAskActionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to ask for a download action.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_DownloadAskActionDialog import Ui_DownloadAskActionDialog
--- a/eric7/WebBrowser/Download/DownloadItem.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadItem.py	Sun May 16 20:07:24 2021 +0200
@@ -9,12 +9,12 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QTime, QUrl, QStandardPaths, QFileInfo, QDateTime
 )
-from PyQt5.QtGui import QPalette, QDesktopServices
-from PyQt5.QtWidgets import QWidget, QStyle, QDialog
-from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem
+from PyQt6.QtGui import QPalette, QDesktopServices
+from PyQt6.QtWidgets import QWidget, QStyle, QDialog
+from PyQt6.QtWebEngineWidgets import QWebEngineDownloadItem

 from E5Gui import E5FileDialog

@@ -109,7 +109,7 @@
         self.__bytesTotal = -1

         # start timer for the download estimation
-        self.__downloadTime.start()
+        self.__downloadTime = QTime.currentTime()

         # attach to the download item object
         self.__url = self.__downloadItem.url()
@@ -421,7 +421,10 @@
         if not self.downloading():
             return -1.0

-        return self.__bytesReceived * 1000.0 / self.__downloadTime.elapsed()
+        return (
+            self.__bytesReceived * 1000.0 /
+            self.__downloadTime.msecsTo(QTime.currentTime)
+        )

     def __updateInfoLabel(self):
         """
--- a/eric7/WebBrowser/Download/DownloadManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadManager.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing the download manager class.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QModelIndex, QFileInfo, QUrl, QBasicTimer
 )
-from PyQt5.QtGui import QCursor, QKeySequence
-from PyQt5.QtWidgets import (
-    QDialog, QStyle, QFileIconProvider, QMenu, QApplication, QShortcut
+from PyQt6.QtGui import QCursor, QKeySequence, QShortcut
+from PyQt6.QtWidgets import (
+    QDialog, QStyle, QFileIconProvider, QMenu, QApplication
 )

 from E5Gui import E5MessageBox
@@ -560,7 +560,7 @@
         @rtype QWinTaskbarButton or None
         """
         if Globals.isWindowsPlatform():
-            from PyQt5.QtWinExtras import QWinTaskbarButton
+            from PyQt6.QtWinExtras import QWinTaskbarButton
             if self.__winTaskbarButton is None:
                 window = WebBrowserWindow.mainWindow()
                 self.__winTaskbarButton = QWinTaskbarButton(
--- a/eric7/WebBrowser/Download/DownloadManagerButton.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadManagerButton.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a tool button for the download manager.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import pyqtSlot, Qt

 from E5Gui.E5ToolButton import E5ToolButton
--- a/eric7/WebBrowser/Download/DownloadModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadModel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the download model.
 """

-from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl
+from PyQt6.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl


 class DownloadModel(QAbstractListModel):
--- a/eric7/WebBrowser/Download/DownloadUtilities.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadUtilities.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing some utility functions for the Download package.
 """

-from PyQt5.QtCore import QCoreApplication
+from PyQt6.QtCore import QCoreApplication


 def timeString(timeRemaining):
--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import contextlib

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QLabel, QHBoxLayout, QPushButton
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QLabel, QHBoxLayout, QPushButton
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 from E5Gui.E5AnimatedWidget import E5AnimatedWidget
--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,9 +9,9 @@

 import contextlib

-from PyQt5.QtCore import QObject
-from PyQt5.QtWidgets import QDialog
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QDialog
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 import Globals
 import Preferences
--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,11 +7,11 @@
 Module implementing the feature permission dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QTreeWidget, QAbstractItemView
 )
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 import UI.PixmapCache
--- a/eric7/WebBrowser/Feeds/FeedEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Feeds/FeedEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to edit feed data.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_FeedEditDialog import Ui_FeedEditDialog
--- a/eric7/WebBrowser/Feeds/FeedsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Feeds/FeedsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import functools

-from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QDialog, QPushButton, QLabel
+from PyQt6.QtCore import QUrl
+from PyQt6.QtWidgets import QDialog, QPushButton, QLabel

 from .Ui_FeedsDialog import Ui_FeedsDialog
--- a/eric7/WebBrowser/Feeds/FeedsManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Feeds/FeedsManager.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a RSS feeds manager dialog.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader
-from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QMenu, QApplication
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader
+from PyQt6.QtGui import QCursor
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QMenu, QApplication
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QDir, QFile
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QDir, QFile
+from PyQt6.QtWidgets import QDialog

 from .Ui_GreaseMonkeyAddScriptDialog import Ui_GreaseMonkeyAddScriptDialog
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the GreaseMonkey scripts configuration dialog.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QDialog, QListWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Sun May 16 20:07:24 2021 +0200
@@ -8,10 +8,10 @@
 scripts.
 """

-from PyQt5.QtCore import Qt, QSize, QRect
-from PyQt5.QtGui import QFontMetrics, QPalette, QFont
-from PyQt5.QtWidgets import QStyle, QStyledItemDelegate, QApplication
-from PyQt5.QtWidgets import QStyleOptionViewItem
+from PyQt6.QtCore import Qt, QSize, QRect
+from PyQt6.QtGui import QFontMetrics, QPalette, QFont
+from PyQt6.QtWidgets import QStyle, QStyledItemDelegate, QApplication
+from PyQt6.QtWidgets import QStyleOptionViewItem

 import UI.PixmapCache
 import Globals
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a special list widget for GreaseMonkey scripts.
 """

-from PyQt5.QtCore import pyqtSignal, QRect
-from PyQt5.QtWidgets import QListWidget, QListWidgetItem
+from PyQt6.QtCore import pyqtSignal, QRect
+from PyQt6.QtWidgets import QListWidget, QListWidgetItem

 from .GreaseMonkeyConfigurationListDelegate import (
     GreaseMonkeyConfigurationListDelegate
@@ -63,8 +63,8 @@

         @param evt mouse press event (QMouseEvent)
         """
-        if self.__containsRemoveIcon(evt.pos()):
-            self.removeItemRequested.emit(self.itemAt(evt.pos()))
+        if self.__containsRemoveIcon(evt.position().toPoint()):
+            self.removeItemRequested.emit(self.itemAt(evt.position().toPoint()))
             return

         super().mousePressEvent(evt)
@@ -75,8 +75,8 @@

         @param evt mouse press event (QMouseEvent)
         """
-        if self.__containsRemoveIcon(evt.pos()):
-            self.removeItemRequested.emit(self.itemAt(evt.pos()))
+        if self.__containsRemoveIcon(evt.position().toPoint()):
+            self.removeItemRequested.emit(self.itemAt(evt.position().toPoint()))
             return

         super().mouseDoubleClickEvent(
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show GreaseMonkey script information.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_GreaseMonkeyConfigurationScriptInfoDialog import (
     Ui_GreaseMonkeyConfigurationScriptInfoDialog
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings, QFileInfo
-from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings, QFileInfo
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

 from WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the Python side for GreaseMonkey scripts.
 """

-from PyQt5.QtCore import pyqtSlot, QObject, QSettings
-from PyQt5.QtGui import QGuiApplication
+from PyQt6.QtCore import pyqtSlot, QObject, QSettings
+from PyQt6.QtGui import QGuiApplication


 class GreaseMonkeyJsObject(QObject):
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QObject, QTimer, QFile, QFileInfo, QDir,
     QSettings, QMetaObject, QUrl, Q_ARG, QCoreApplication
 )
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun May 16 20:07:24 2021 +0200
@@ -9,12 +9,12 @@

 import re

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QObject, QUrl, QByteArray, QCryptographicHash
 )
-from PyQt5.QtGui import QIcon, QPixmap, QImage
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
-from PyQt5.QtWebEngineWidgets import QWebEngineScript
+from PyQt6.QtGui import QIcon, QPixmap, QImage
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtWebEngineWidgets import QWebEngineScript

 from .GreaseMonkeyJavaScript import bootstrap_js, values_js
 from .GreaseMonkeyDownloader import GreaseMonkeyDownloader
--- a/eric7/WebBrowser/History/HistoryCompleter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryCompleter.py	Sun May 16 20:07:24 2021 +0200
@@ -9,8 +9,8 @@

 import re

-from PyQt5.QtCore import Qt, QTimer, QSortFilterProxyModel
-from PyQt5.QtWidgets import QTableView, QAbstractItemView, QCompleter
+from PyQt6.QtCore import Qt, QTimer, QSortFilterProxyModel
+from PyQt6.QtWidgets import QTableView, QAbstractItemView, QCompleter

 from .HistoryModel import HistoryModel
 from .HistoryFilterModel import HistoryFilterModel
--- a/eric7/WebBrowser/History/HistoryDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to manage history.
 """

-from PyQt5.QtCore import pyqtSignal, Qt, QUrl
-from PyQt5.QtGui import QFontMetrics, QCursor
-from PyQt5.QtWidgets import QDialog, QMenu, QApplication
+from PyQt6.QtCore import pyqtSignal, Qt, QUrl
+from PyQt6.QtGui import QFontMetrics, QCursor
+from PyQt6.QtWidgets import QDialog, QMenu, QApplication

 from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/eric7/WebBrowser/History/HistoryFilterModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryFilterModel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the history filter model.
 """

-from PyQt5.QtCore import Qt, QDateTime, QModelIndex, QAbstractProxyModel
+from PyQt6.QtCore import Qt, QDateTime, QModelIndex, QAbstractProxyModel

 from .HistoryModel import HistoryModel
--- a/eric7/WebBrowser/History/HistoryManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QFileInfo, QDateTime, QDate, QTime, QUrl, QTimer,
     QFile, QIODevice, QByteArray, QDataStream, QTemporaryFile, QObject
 )
--- a/eric7/WebBrowser/History/HistoryMenu.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryMenu.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import sys
 import functools

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, Qt, QMimeData, QUrl, QModelIndex, QSortFilterProxyModel,
     QAbstractProxyModel
 )
-from PyQt5.QtWidgets import QMenu
+from PyQt6.QtWidgets import QMenu

 from E5Gui.E5ModelMenu import E5ModelMenu
 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/History/HistoryModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
+from PyQt6.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl

 import WebBrowser.WebBrowserWindow
--- a/eric7/WebBrowser/History/HistoryTreeModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/History/HistoryTreeModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import bisect

-from PyQt5.QtCore import Qt, QModelIndex, QDate, QAbstractProxyModel
+from PyQt6.QtCore import Qt, QModelIndex, QDate, QAbstractProxyModel

 from .HistoryModel import HistoryModel
--- a/eric7/WebBrowser/ImageSearch/ImageSearchEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/ImageSearch/ImageSearchEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the image search engine.
 """

-from PyQt5.QtCore import QObject, QUrl
+from PyQt6.QtCore import QObject, QUrl

 import Preferences
--- a/eric7/WebBrowser/JavaScript/ExternalJsObject.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/JavaScript/ExternalJsObject.py	Sun May 16 20:07:24 2021 +0200
@@ -13,7 +13,7 @@
 # Copyright (C) David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import pyqtProperty, QObject
+from PyQt6.QtCore import pyqtProperty, QObject

 from WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Python side for calling the password manager.
 """

-from PyQt5.QtCore import pyqtSlot, QObject, QByteArray
+from PyQt6.QtCore import pyqtSlot, QObject, QByteArray


 class PasswordManagerJsObject(QObject):
--- a/eric7/WebBrowser/JavaScript/StartPageJsObject.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/JavaScript/StartPageJsObject.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the Python side of the eric home page.
 """

-from PyQt5.QtCore import pyqtSlot, QObject
+from PyQt6.QtCore import pyqtSlot, QObject


 class StartPageJsObject(QObject):
--- a/eric7/WebBrowser/Navigation/NavigationBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Navigation/NavigationBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing the navigation bar widget.
 """

-from PyQt5.QtCore import Qt, QUrl
-from PyQt5.QtWidgets import (
-    QWidget, QHBoxLayout, QStyle, QToolButton, QSplitter, QSizePolicy, QMenu,
-    QAction
+from PyQt6.QtCore import Qt, QUrl
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import (
+    QWidget, QHBoxLayout, QStyle, QToolButton, QSplitter, QSizePolicy, QMenu
 )

 from E5Gui.E5ToolButton import E5ToolButton
--- a/eric7/WebBrowser/Navigation/NavigationContainer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Navigation/NavigationContainer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the navigation container widget.
 """

-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QSizePolicy


 class NavigationContainer(QWidget):
--- a/eric7/WebBrowser/Navigation/ReloadStopButton.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Navigation/ReloadStopButton.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a button alternating between reload and stop.
 """

-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt
+from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt

 from E5Gui.E5ToolButton import E5ToolButton
--- a/eric7/WebBrowser/Network/EricSchemeHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/EricSchemeHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a scheme handler for the eric: scheme.
 """

-from PyQt5.QtCore import pyqtSignal, QBuffer, QIODevice, QUrlQuery, QMutex
-from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler
+from PyQt6.QtCore import pyqtSignal, QBuffer, QIODevice, QUrlQuery, QMutex
+from PyQt6.QtWebEngineCore import QWebEngineUrlSchemeHandler

 from E5Gui.E5Application import e5App
--- a/eric7/WebBrowser/Network/NetworkManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/NetworkManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,9 +10,9 @@
 import json
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QByteArray
-from PyQt5.QtWidgets import QStyle, QDialog
-from PyQt5.QtNetwork import (
+from PyQt6.QtCore import pyqtSignal, QByteArray
+from PyQt6.QtWidgets import QStyle, QDialog
+from PyQt6.QtNetwork import (
     QNetworkAccessManager, QNetworkProxy, QNetworkProxyFactory, QNetworkRequest
 )
--- a/eric7/WebBrowser/Network/NetworkUrlInterceptor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/NetworkUrlInterceptor.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 by QtWebEngine.
 """

-from PyQt5.QtCore import QMutex, QUrl
-from PyQt5.QtWebEngineCore import (
+from PyQt6.QtCore import QMutex, QUrl
+from PyQt6.QtWebEngineCore import (
     QWebEngineUrlRequestInterceptor, QWebEngineUrlRequestInfo
 )
--- a/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import json
 import contextlib

-from PyQt5.QtCore import QObject, QUrl
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import QObject, QUrl
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 import Utilities
--- a/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage registered protocol handlers.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_ProtocolHandlerManagerDialog import Ui_ProtocolHandlerManagerDialog
--- a/eric7/WebBrowser/Network/QtHelpSchemeHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/QtHelpSchemeHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@
 import mimetypes
 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QByteArray, QIODevice, QBuffer, QMutex
 )
-from PyQt5.QtWebEngineCore import (
+from PyQt6.QtWebEngineCore import (
     QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob
 )
--- a/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage the Send Referer whitelist.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
-from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit
+from PyQt6.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

 from .Ui_SendRefererWhitelistDialog import Ui_SendRefererWhitelistDialog
--- a/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to edit the SSL error exceptions.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QMenu
-from PyQt5.QtWebEngineWidgets import QWebEngineCertificateError
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QMenu
+from PyQt6.QtWebEngineWidgets import QWebEngineCertificateError

 from .Ui_SslErrorExceptionsDialog import Ui_SslErrorExceptionsDialog
--- a/eric7/WebBrowser/Network/UrlInterceptor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Network/UrlInterceptor.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing an URL interceptor base class.
 """

-from PyQt5.QtCore import QObject
+from PyQt6.QtCore import QObject


 class UrlInterceptor(QObject):
--- a/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog for the configuration of search engines.
 """

-from PyQt5.QtWidgets import QDialog
-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot

 from E5Gui import E5MessageBox, E5FileDialog
--- a/eric7/WebBrowser/OpenSearch/OpenSearchEditDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchEditDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit the data of a search engine.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_OpenSearchEditDialog import Ui_OpenSearchEditDialog
--- a/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py	Sun May 16 20:07:24 2021 +0200
@@ -10,12 +10,12 @@
 import re
 import json

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QLocale, QUrl, QUrlQuery, QByteArray, QBuffer,
     QIODevice, QObject
 )
-from PyQt5.QtGui import QImage
-from PyQt5.QtNetwork import (
+from PyQt6.QtGui import QImage
+from PyQt6.QtNetwork import (
     QNetworkRequest, QNetworkAccessManager, QNetworkReply
 )
--- a/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,8 @@
 Module implementing a QAction subclass for open search.
 """

-from PyQt5.QtCore import QUrl
-from PyQt5.QtGui import QPixmap, QIcon
-from PyQt5.QtWidgets import QAction
+from PyQt6.QtCore import QUrl
+from PyQt6.QtGui import QPixmap, QIcon, QAction


 class OpenSearchEngineAction(QAction):
--- a/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@
 import re
 import contextlib

-from PyQt5.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex
-from PyQt5.QtGui import QPixmap, QIcon
+from PyQt6.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex
+from PyQt6.QtGui import QPixmap, QIcon


 class OpenSearchEngineModel(QAbstractTableModel):
--- a/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, QUrlQuery
 )
-from PyQt5.QtWidgets import QLineEdit, QInputDialog
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtWidgets import QLineEdit, QInputDialog
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/OpenSearch/OpenSearchReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchReader.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a reader for open search engine descriptions.
 """

-from PyQt5.QtCore import QXmlStreamReader, QIODevice, QCoreApplication
+from PyQt6.QtCore import QXmlStreamReader, QIODevice, QCoreApplication


 class OpenSearchReader(QXmlStreamReader):
--- a/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a writer for open search engine descriptions.
 """

-from PyQt5.QtCore import QXmlStreamWriter, QIODevice
+from PyQt6.QtCore import QXmlStreamWriter, QIODevice


 class OpenSearchWriter(QXmlStreamWriter):
--- a/eric7/WebBrowser/PageScreenDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/PageScreenDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to save a screenshot of a web page.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QFile, QFileInfo, QSize
-from PyQt5.QtGui import QImage, QPainter, QPixmap
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import pyqtSlot, Qt, QFile, QFileInfo, QSize
+from PyQt6.QtGui import QImage, QPainter, QPixmap
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton

 from E5Gui import E5FileDialog, E5MessageBox
--- a/eric7/WebBrowser/Passwords/LoginForm.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/LoginForm.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a data structure for login forms.
 """

-from PyQt5.QtCore import QUrl
+from PyQt6.QtCore import QUrl


 class LoginForm:
--- a/eric7/WebBrowser/Passwords/PasswordManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,11 +9,11 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QByteArray, QUrl, QCoreApplication, QXmlStreamReader
 )
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWebEngineWidgets import QWebEngineScript
+from PyQt6.QtWidgets import QApplication
+from PyQt6.QtWebEngineWidgets import QWebEngineScript

 from E5Gui import E5MessageBox
 from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/eric7/WebBrowser/Passwords/PasswordModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel


 class PasswordModel(QAbstractTableModel):
--- a/eric7/WebBrowser/Passwords/PasswordReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordReader.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to read login data files.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QXmlStreamReader, QIODevice, QFile, QCoreApplication, QUrl
 )
--- a/eric7/WebBrowser/Passwords/PasswordWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write login data files.
 """

-from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile


 class PasswordWriter(QXmlStreamWriter):
--- a/eric7/WebBrowser/Passwords/PasswordsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show all saved logins.
 """

-from PyQt5.QtCore import pyqtSlot, QSortFilterProxyModel
-from PyQt5.QtGui import QFont, QFontMetrics
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QSortFilterProxyModel
+from PyQt6.QtGui import QFont, QFontMetrics
+from PyQt6.QtWidgets import QDialog

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter personal data.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_PersonalDataDialog import Ui_PersonalDataDialog
--- a/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import functools

-from PyQt5.QtCore import Qt, QObject, QPoint
-from PyQt5.QtWidgets import QDialog, QMenu
+from PyQt6.QtCore import Qt, QObject, QPoint
+from PyQt6.QtWidgets import QDialog, QMenu

 import Preferences
 import UI.PixmapCache
--- a/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,10 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QThread, Qt, QMutex, QDateTime, QDir, QLibraryInfo, QFileInfo
 )
-from PyQt5.QtHelp import QHelpEngineCore
+from PyQt6.QtHelp import QHelpEngineCore

 from eric7config import getConfig

@@ -127,12 +127,12 @@

         if version == 4:
             docsPath = QDir(
-                QLibraryInfo.location(
-                    QLibraryInfo.LibraryLocation.DocumentationPath) +
+                QLibraryInfo.path(
+                    QLibraryInfo.LibraryPath.DocumentationPath) +
                 QDir.separator() + "qch")
         elif version == 5:
-            docsPath = QLibraryInfo.location(
-                QLibraryInfo.LibraryLocation.DocumentationPath)
+            docsPath = QLibraryInfo.path(
+                QLibraryInfo.LibraryPath.DocumentationPath)
             if (
                 not os.path.isdir(docsPath) or
                 len(QDir(docsPath).entryList(["*.qch"])) == 0
--- a/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QEvent
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QEvent
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, QDialog, QApplication
 )

@@ -62,6 +62,7 @@
             self.__disableSearchEdit)
         self.__engine.indexModel().indexCreated.connect(
             self.__enableSearchEdit)
+        # TODO: change code to use documentActivated and documentsActivated
         self.__index.linkActivated.connect(self.__linkActivated)
         self.__index.linksActivated.connect(self.__linksActivated)
         self.__index.customContextMenuRequested.connect(
--- a/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu
 )

@@ -66,7 +66,7 @@
         """
         Private slot to perform a search of the database.
         """
-        query = self.__query.query()
+        query = self.__query.searchInput()
         self.__engine.search(query)

     def __searchingStarted(self):
@@ -95,7 +95,7 @@
             buttons = QApplication.mouseButtons()
             modifiers = QApplication.keyboardModifiers()

-            if buttons & Qt.MouseButton.MidButton:
+            if buttons & Qt.MouseButton.MiddleButton:
                 self.newTab.emit(url)
             else:
                 if (
--- a/eric7/WebBrowser/QtHelp/HelpTocWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpTocWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a window for showing the QtHelp TOC.
 """

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QMenu, QApplication
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import QWidget, QVBoxLayout, QMenu, QApplication


 class HelpTocWidget(QWidget):
@@ -67,7 +67,7 @@
             buttons = QApplication.mouseButtons()
             modifiers = QApplication.keyboardModifiers()

-            if buttons & Qt.MouseButton.MidButton:
+            if buttons & Qt.MouseButton.MiddleButton:
                 self.newTab.emit(url)
             else:
                 if (
--- a/eric7/WebBrowser/QtHelp/HelpTopicDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpTopicDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to select a help topic to display.
 """

-from PyQt5.QtWidgets import QDialog
-from PyQt5.QtCore import QUrl
+from PyQt6.QtWidgets import QDialog
+from PyQt6.QtCore import QUrl

 from .Ui_HelpTopicDialog import Ui_HelpTopicDialog
--- a/eric7/WebBrowser/QtHelp/QtHelpDocumentationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/QtHelpDocumentationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import sqlite3
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QItemSelectionModel
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QItemSelectionModel
+from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QListWidgetItem, QInputDialog, QLineEdit
 )
-from PyQt5.QtHelp import QHelpEngineCore
+from PyQt6.QtHelp import QHelpEngineCore

 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
@@ -282,20 +282,22 @@
         self.attributesList.clear()

         helpEngineCore = QHelpEngineCore(self.__engine.collectionFile())
+        helpFilterEngine = helpEngineCore.filterEngine()

         self.__removedFilters = []
         self.__filterMap = {}
         self.__filterMapBackup = {}
         self.__removedAttributes = []

-        for customFilter in helpEngineCore.customFilters():
-            atts = helpEngineCore.filterAttributes(customFilter)
-            self.__filterMapBackup[customFilter] = atts
-            if customFilter not in self.__filterMap:
-                self.__filterMap[customFilter] = atts
+        for filterName in helpFilterEngine.filters():
+            filterData = helpFilterEngine.filterData(filterName)
+            self.__filterMapBackup[filterName] = filterData
+            if filterName not in self.__filterMap:
+                self.__filterMap[filterName] = filterData

+        # TODO: change code to use QHelpFilterEngine and QHelpFilterData
         self.filtersList.addItems(sorted(self.__filterMap.keys()))
-        for attr in helpEngineCore.filterAttributes():
+        for attr in helpFilterEngine.filterData():
             QTreeWidgetItem(self.attributesList, [attr])
         self.attributesList.sortItems(0, Qt.SortOrder.AscendingOrder)

@@ -497,7 +499,7 @@
             for customFilter in self.__removedFilters:
                 self.__engine.removeCustomFilter(customFilter)
             for customFilter in self.__filterMap:
-                self.__engine.addCustomFilter(
+                self.__engine.addFilterData(
                     customFilter, self.__filterMap[customFilter])

         if self.__removedAttributes:
--- a/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import os
 import shutil

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import json
 import base64

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QDateTime, QUrl, QByteArray, QCoreApplication,
     QEventLoop
 )
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py	Sun May 16 20:07:24 2021 +0200
@@ -16,10 +16,10 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QObject, QByteArray, QCryptographicHash, QCoreApplication, QEventLoop
 )
-from PyQt5.QtSql import QSql, QSqlDatabase, QSqlQuery
+from PyQt6.QtSql import QSql, QSqlDatabase, QSqlQuery

 from .SafeBrowsingThreatList import ThreatList
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to configure safe browsing support.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QDateTime
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QDateTime
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractButton
 )
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a widget to show some threat information.
 """

-from PyQt5.QtCore import Qt, QPoint
-from PyQt5.QtWidgets import QMenu, QLabel, QHBoxLayout, QSizePolicy
+from PyQt6.QtCore import Qt, QPoint
+from PyQt6.QtWidgets import QMenu, QLabel, QHBoxLayout, QSizePolicy

 import UI.PixmapCache
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the label to show some SSL info.
 """

-from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QPoint
-from PyQt5.QtWidgets import QLabel
+from PyQt6.QtCore import Qt, pyqtSlot, pyqtSignal, QPoint
+from PyQt6.QtWidgets import QLabel


 class SafeBrowsingLabel(QLabel):
--- a/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Sun May 16 20:07:24 2021 +0200
@@ -17,7 +17,7 @@
 import os
 import base64

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QObject, QCoreApplication, QUrl, QDateTime, QTimer
 )
--- a/eric7/WebBrowser/SearchWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SearchWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the search bar for the web browser.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtGui import QPalette, QBrush, QColor
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtGui import QPalette, QBrush, QColor
+from PyQt6.QtWidgets import QWidget

 from .Ui_SearchWidget import Ui_SearchWidget
--- a/eric7/WebBrowser/Session/SessionManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Session/SessionManager.py	Sun May 16 20:07:24 2021 +0200
@@ -12,13 +12,14 @@
 import functools
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QObject, QTimer, QDir, QFile, QFileInfo,
     QFileSystemWatcher, QByteArray, QDateTime
 )
-from PyQt5.QtWidgets import (
-    QActionGroup, QApplication, QInputDialog, QLineEdit, QDialog,
-    QDialogButtonBox, QLabel, QComboBox, QVBoxLayout
+from PyQt6.QtGui import QActionGroup
+from PyQt6.QtWidgets import (
+    QApplication, QInputDialog, QLineEdit, QDialog, QDialogButtonBox, QLabel,
+    QComboBox, QVBoxLayout
 )

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/Session/SessionManagerDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Session/SessionManagerDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to manage sessions.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo
-from PyQt5.QtGui import QPalette
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt, QFileInfo
+from PyQt6.QtGui import QPalette
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_SessionManagerDialog import Ui_SessionManagerDialog
--- a/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,15 +7,15 @@
 Module implementing a dialog to show some information about a site.
 """

-from PyQt5.QtCore import pyqtSlot, QUrl, Qt
-from PyQt5.QtGui import QPixmap, QImage, QPainter, QColor, QBrush
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, QUrl, Qt
+from PyQt6.QtGui import QPixmap, QImage, QPainter, QColor, QBrush
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QGraphicsScene, QMenu, QApplication,
     QGraphicsPixmapItem
 )
 try:
-    from PyQt5.QtNetwork import QSslCertificate     # __IGNORE_WARNING__
+    from PyQt6.QtNetwork import QSslCertificate     # __IGNORE_WARNING__
     SSL = True
 except ImportError:
     SSL = False
--- a/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a widget to show some site information.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import (
     QMenu, QGridLayout, QHBoxLayout, QLabel, QFrame, QSizePolicy, QPushButton,
     QSpacerItem
 )
--- a/eric7/WebBrowser/SpeedDial/PageThumbnailer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SpeedDial/PageThumbnailer.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing an object to create a thumbnail image of a web site.
 """

-from PyQt5.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl, QTimer
-from PyQt5.QtGui import QPixmap, QImage, QPainter
-from PyQt5.QtWebEngineWidgets import QWebEngineView
+from PyQt6.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl, QTimer
+from PyQt6.QtGui import QPixmap, QImage, QPainter
+from PyQt6.QtWebEngineWidgets import QWebEngineView


 class PageThumbnailer(QObject):
--- a/eric7/WebBrowser/SpeedDial/SpeedDial.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SpeedDial/SpeedDial.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, QObject, QCryptographicHash, QByteArray, QUrl,
     qWarning
 )
--- a/eric7/WebBrowser/SpeedDial/SpeedDialReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SpeedDial/SpeedDialReader.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 Module implementing a class to read speed dial data files.
 """

-from PyQt5.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
+from PyQt6.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication


 class SpeedDialReader(QXmlStreamReader):
--- a/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write speed dial data files.
 """

-from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile


 class SpeedDialWriter(QXmlStreamWriter):
--- a/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -14,11 +14,11 @@
 import shutil
 import contextlib

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtWidgets import (
     QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem
 )
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/StatusBar/ImagesIcon.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/StatusBar/ImagesIcon.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import QGraphicsColorizeEffect, QMenu
-from PyQt5.QtWebEngineWidgets import QWebEngineSettings
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu
+from PyQt6.QtWebEngineWidgets import QWebEngineSettings

 from .StatusBarIcon import StatusBarIcon
--- a/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Sun May 16 20:07:24 2021 +0200
@@ -12,9 +12,9 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QTimer
-from PyQt5.QtWidgets import QGraphicsColorizeEffect, QMenu, QDialog
-from PyQt5.QtWebEngineWidgets import QWebEngineSettings
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QTimer
+from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu, QDialog
+from PyQt6.QtWebEngineWidgets import QWebEngineSettings

 from .StatusBarIcon import StatusBarIcon
--- a/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the JavaScript settings dialog.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_JavaScriptSettingsDialog import Ui_JavaScriptSettingsDialog
--- a/eric7/WebBrowser/Sync/DirectorySyncHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/DirectorySyncHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal, QByteArray, QFileInfo, QCoreApplication
+from PyQt6.QtCore import pyqtSignal, QByteArray, QFileInfo, QCoreApplication

 from .SyncHandler import SyncHandler
--- a/eric7/WebBrowser/Sync/FtpSyncHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/FtpSyncHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -11,7 +11,7 @@
 import io
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QTimer, QFileInfo, QCoreApplication, QByteArray
 )
--- a/eric7/WebBrowser/Sync/SyncAssistantDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncAssistantDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a wizard dialog to enter the synchronization data.
 """

-from PyQt5.QtWidgets import QWizard
+from PyQt6.QtWidgets import QWizard

 import UI.PixmapCache
 import Globals
--- a/eric7/WebBrowser/Sync/SyncCheckPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncCheckPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing the synchronization status wizard page.
 """

-from PyQt5.QtCore import QTimer
-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtCore import QTimer
+from PyQt6.QtWidgets import QWizardPage

 from . import SyncGlobals
--- a/eric7/WebBrowser/Sync/SyncDataPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncDataPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the synchronization data wizard page.
 """

-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtWidgets import QWizardPage

 from .Ui_SyncDataPage import Ui_SyncDataPage
--- a/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the synchronization shared directory settings wizard page.
 """

-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtWidgets import QWizardPage

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/WebBrowser/Sync/SyncEncryptionPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncEncryptionPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing encryption settings wizard page.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QWizardPage

 from .Ui_SyncEncryptionPage import Ui_SyncEncryptionPage
--- a/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the synchronization FTP host settings wizard page.
 """

-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtWidgets import QWizardPage

 from .Ui_SyncFtpSettingsPage import Ui_SyncFtpSettingsPage
--- a/eric7/WebBrowser/Sync/SyncHandler.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncHandler.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import QObject, pyqtSignal, QByteArray
+from PyQt6.QtCore import QObject, pyqtSignal, QByteArray

 import Preferences
--- a/eric7/WebBrowser/Sync/SyncHostTypePage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncHostTypePage.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the synchronization host type wizard page.
 """

-from PyQt5.QtWidgets import QWizardPage
+from PyQt6.QtWidgets import QWizardPage

 from . import SyncGlobals
--- a/eric7/WebBrowser/Sync/SyncManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import QObject, pyqtSignal
+from PyQt6.QtCore import QObject, pyqtSignal

 import Preferences
--- a/eric7/WebBrowser/TabManager/TabManagerWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/TabManager/TabManagerWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -15,9 +15,10 @@
 import os
 import collections

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect
-from PyQt5.QtWidgets import (
-    QWidget, QVBoxLayout, QTreeWidget, QTreeWidgetItem, QMenu, QStyle, QAction
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import (
+    QWidget, QVBoxLayout, QTreeWidget, QTreeWidgetItem, QMenu, QStyle
 )

 import E5Network
--- a/eric7/WebBrowser/Tools/DelayedFileWatcher.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/DelayedFileWatcher.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a file system watcher with a delay.
 """

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileSystemWatcher, QTimer
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFileSystemWatcher, QTimer


 class DelayedFileWatcher(QFileSystemWatcher):
--- a/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@

 import os

-from PyQt5.QtCore import pyqtSlot, QMarginsF, QStandardPaths
-from PyQt5.QtGui import QPageLayout, QPageSize
-from PyQt5.QtPrintSupport import QPrinter, QPageSetupDialog
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QMarginsF, QStandardPaths
+from PyQt6.QtGui import QPageLayout, QPageSize
+from PyQt6.QtPrintSupport import QPrinter, QPageSetupDialog
+from PyQt6.QtWidgets import QDialog

 from E5Gui.E5PathPicker import E5PathPickerModes
--- a/eric7/WebBrowser/Tools/Scripts.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/Scripts.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 # Copyright (C) David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import QUrlQuery, QUrl
+from PyQt6.QtCore import QUrlQuery, QUrl

 from .WebBrowserTools import getJavascript
--- a/eric7/WebBrowser/Tools/WebBrowserTools.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebBrowserTools.py	Sun May 16 20:07:24 2021 +0200
@@ -11,10 +11,10 @@
 import re
 import mimetypes

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     QFile, QByteArray, QUrl, QCoreApplication, QBuffer, QIODevice
 )
-from PyQt5.QtGui import QPixmap
+from PyQt6.QtGui import QPixmap


 WebBrowserDataDirectory = {
@@ -234,7 +234,7 @@
     @return tuple containing the Chrome version and the QtWebEngine version
     @rtype tuple of str
     """
-    from PyQt5.QtWebEngineWidgets import QWebEngineProfile
+    from PyQt6.QtWebEngineWidgets import QWebEngineProfile

     useragent = QWebEngineProfile.defaultProfile().httpUserAgent()
     match = re.search(r"""Chrome/([\d.]+)""", useragent)
--- a/eric7/WebBrowser/Tools/WebHitTestResult.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebHitTestResult.py	Sun May 16 20:07:24 2021 +0200
@@ -12,7 +12,7 @@
 # Copyright (C) David Rosca <nowrep@gmail.com>
 #

-from PyQt5.QtCore import QPoint, QRect, QUrl
+from PyQt6.QtCore import QPoint, QRect, QUrl


 class WebHitTestResult:
@@ -117,8 +117,8 @@
         @param data context menu data
         @type QWebEngineContextMenuData
         """
-        from PyQt5.QtWebEngineWidgets import QWebEngineContextMenuData
-        if not data.isValid() or data.position() != self.__pos:
+        from PyQt6.QtWebEngineWidgets import QWebEngineContextMenuData
+        if not data.isValid() or data.position().toPoint() != self.__pos:
             return

         self.__linkTitle = data.linkText()
--- a/eric7/WebBrowser/Tools/WebIconDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebIconDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to manage the Favicons.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import QDialog, QListWidgetItem, QMenu
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import QDialog, QListWidgetItem, QMenu

 from .Ui_WebIconDialog import Ui_WebIconDialog
--- a/eric7/WebBrowser/Tools/WebIconLoader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebIconLoader.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing an object to load web site icons.
 """

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject
-from PyQt5.QtGui import QIcon, QPixmap, QImage
-from PyQt5.QtNetwork import QNetworkRequest, QSslConfiguration
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject
+from PyQt6.QtGui import QIcon, QPixmap, QImage
+from PyQt6.QtNetwork import QNetworkRequest, QSslConfiguration

 try:
-    from PyQt5.QtNetwork import QSslConfiguration     # __IGNORE_WARNING__
+    from PyQt6.QtNetwork import QSslConfiguration     # __IGNORE_WARNING__
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
--- a/eric7/WebBrowser/Tools/WebIconProvider.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebIconProvider.py	Sun May 16 20:07:24 2021 +0200
@@ -11,11 +11,11 @@
 import os
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, QObject, QByteArray, QBuffer, QIODevice, QUrl
 )
-from PyQt5.QtGui import QIcon, QPixmap, QImage
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtGui import QIcon, QPixmap, QImage
+from PyQt6.QtWidgets import QDialog

 from Utilities.AutoSaver import AutoSaver
--- a/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
 bookmark.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog

 from .Ui_BookmarkActionSelectionDialog import Ui_BookmarkActionSelectionDialog
--- a/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show some bookmark info.
 """

-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtGui import QFont
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtGui import QFont
+from PyQt6.QtWidgets import QDialog

 from .Ui_BookmarkInfoDialog import Ui_BookmarkInfoDialog
--- a/eric7/WebBrowser/UrlBar/FavIconLabel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/FavIconLabel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing the label to show the web site icon.
 """

-from PyQt5.QtCore import Qt, QPoint, QMimeData
-from PyQt5.QtGui import QDrag, QPixmap
-from PyQt5.QtWidgets import QLabel, QApplication
+from PyQt6.QtCore import Qt, QPoint, QMimeData
+from PyQt6.QtGui import QDrag, QPixmap
+from PyQt6.QtWidgets import QLabel, QApplication


 class FavIconLabel(QLabel):
@@ -66,7 +66,7 @@
         @param evt reference to the mouse event (QMouseEvent)
         """
         if evt.button() == Qt.MouseButton.LeftButton:
-            self.__dragStartPos = evt.pos()
+            self.__dragStartPos = evt.position().toPoint()
         super().mousePressEvent(evt)

     def mouseReleaseEvent(self, evt):
@@ -87,7 +87,7 @@
         """
         if (
             evt.button() == Qt.MouseButton.LeftButton and
-            ((evt.pos() - self.__dragStartPos).manhattanLength() >
+            ((evt.position().toPoint() - self.__dragStartPos).manhattanLength() >
                 QApplication.startDragDistance()) and
             self.__browser is not None
         ):
--- a/eric7/WebBrowser/UrlBar/SslLabel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/SslLabel.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing the label to show some SSL info (if available).
 """

-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt

 from E5Gui.E5ClickableLabel import E5ClickableLabel
--- a/eric7/WebBrowser/UrlBar/StackedUrlBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/StackedUrlBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a widget to stack url bars.
 """

-from PyQt5.QtWidgets import QStackedWidget, QSizePolicy
+from PyQt6.QtWidgets import QStackedWidget, QSizePolicy


 class StackedUrlBar(QStackedWidget):
--- a/eric7/WebBrowser/UrlBar/UrlBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/UrlBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing the URL bar widget.
 """

-from PyQt5.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, QTimer, QPoint
-from PyQt5.QtGui import QColor, QPalette, QLinearGradient, QIcon
-from PyQt5.QtWidgets import QDialog, QApplication
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, QTimer, QPoint
+from PyQt6.QtGui import QColor, QPalette, QLinearGradient, QIcon
+from PyQt6.QtWidgets import QDialog, QApplication
+from PyQt6.QtWebEngineWidgets import QWebEnginePage
 try:
-    from PyQt5.QtNetwork import QSslCertificate     # __IGNORE_EXCEPTION__
+    from PyQt6.QtNetwork import QSslCertificate     # __IGNORE_EXCEPTION__
 except ImportError:
     QSslCertificate = None      # __IGNORE_WARNING__
--- a/eric7/WebBrowser/UserAgent/UserAgentManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentManager.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import os

-from PyQt5.QtCore import pyqtSignal, QObject, QXmlStreamReader
+from PyQt6.QtCore import pyqtSignal, QObject, QXmlStreamReader

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/UserAgent/UserAgentMenu.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentMenu.py	Sun May 16 20:07:24 2021 +0200
@@ -10,10 +10,9 @@
 import os
 import functools

-from PyQt5.QtCore import QXmlStreamReader, QFile, QIODevice
-from PyQt5.QtWidgets import (
-    QMenu, QAction, QActionGroup, QInputDialog, QLineEdit
-)
+from PyQt6.QtCore import QXmlStreamReader, QFile, QIODevice
+from PyQt6.QtGui import QAction, QActionGroup
+from PyQt6.QtWidgets import QMenu, QInputDialog, QLineEdit

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/UserAgent/UserAgentModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel


 class UserAgentModel(QAbstractTableModel):
--- a/eric7/WebBrowser/UserAgent/UserAgentReader.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentReader.py	Sun May 16 20:07:24 2021 +0200
@@ -8,7 +8,7 @@
 Module implementing a class to read user agent data files.
 """

-from PyQt5.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
+from PyQt6.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication


 class UserAgentReader(QXmlStreamReader):
--- a/eric7/WebBrowser/UserAgent/UserAgentWriter.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentWriter.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a class to write user agent data files.
 """

-from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile


 class UserAgentWriter(QXmlStreamWriter):
--- a/eric7/WebBrowser/UserAgent/UserAgentsDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/UserAgent/UserAgentsDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show all saved user agent settings.
 """

-from PyQt5.QtCore import QSortFilterProxyModel
-from PyQt5.QtGui import QFont, QFontMetrics
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QSortFilterProxyModel
+from PyQt6.QtGui import QFont, QFontMetrics
+from PyQt6.QtWidgets import QDialog

 from WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/eric7/WebBrowser/VirusTotal/VirusTotalApi.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/VirusTotal/VirusTotalApi.py	Sun May 16 20:07:24 2021 +0200
@@ -10,8 +10,8 @@

 import json

-from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QUrlQuery, QByteArray
-from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtCore import pyqtSignal, QObject, QUrl, QUrlQuery, QByteArray
+from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply

 from E5Gui import E5MessageBox
--- a/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the VirusTotal domain report.
 """

-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_VirusTotalDomainReportDialog import Ui_VirusTotalDomainReportDialog
--- a/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to show the VirusTotal IP address report.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_VirusTotalIpReportDialog import Ui_VirusTotalIpReportDialog
--- a/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to show the 'whois' information.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_VirusTotalWhoisDialog import Ui_VirusTotalWhoisDialog
--- a/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to select which private data to clear.
 """

-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog

 from .Ui_WebBrowserClearPrivateDataDialog import (
     Ui_WebBrowserClearPrivateDataDialog
--- a/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Sun May 16 20:07:24 2021 +0200
@@ -7,10 +7,10 @@
 Module implementing a JavaScript console widget.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QTextCursor
-from PyQt5.QtWidgets import QTextEdit, QMenu
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QTextCursor
+from PyQt6.QtWidgets import QTextEdit, QMenu
+from PyQt6.QtWebEngineWidgets import QWebEnginePage


 class WebBrowserJavaScriptConsole(QTextEdit):
--- a/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to configure the preferred languages.
 """

-from PyQt5.QtCore import pyqtSlot, QLocale, QStringListModel
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import pyqtSlot, QLocale, QStringListModel
+from PyQt6.QtWidgets import QDialog

 from .Ui_WebBrowserLanguagesDialog import Ui_WebBrowserLanguagesDialog
--- a/eric7/WebBrowser/WebBrowserPage.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Sun May 16 20:07:24 2021 +0200
@@ -8,23 +8,23 @@
 Module implementing the helpbrowser using QWebView.
 """

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF,
     QT_VERSION
 )
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWebEngineWidgets import (
+from PyQt6.QtGui import QDesktopServices
+from PyQt6.QtWebEngineWidgets import (
     QWebEnginePage, QWebEngineSettings, QWebEngineScript
 )
 try:
-    from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION
+    from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION
     # __IGNORE_EXCEPTION__
 except (AttributeError, ImportError):
     PYQT_WEBENGINE_VERSION = QT_VERSION
-from PyQt5.QtWebChannel import QWebChannel
+from PyQt6.QtWebChannel import QWebChannel

 try:
-    from PyQt5.QtNetwork import QSslConfiguration, QSslCertificate
+    from PyQt6.QtNetwork import QSslConfiguration, QSslCertificate
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
@@ -583,7 +583,7 @@
         @param request reference to the registration request
         @type QWebEngineRegisterProtocolHandlerRequest
         """
-        from PyQt5.QtWebEngineCore import (
+        from PyQt6.QtWebEngineCore import (
             QWebEngineRegisterProtocolHandlerRequest
         )
--- a/eric7/WebBrowser/WebBrowserSingleApplication.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserSingleApplication.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@
 browser.
 """

-from PyQt5.QtCore import pyqtSignal
+from PyQt6.QtCore import pyqtSignal

 from Toolbox.SingleApplication import (
     SingleApplicationClient, SingleApplicationServer
--- a/eric7/WebBrowser/WebBrowserSnap.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserSnap.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing functions to generate page previews.
 """

-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QPixmap, QPainter
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPixmap, QPainter


 def renderTabPreview(view, w, h):
--- a/eric7/WebBrowser/WebBrowserTabBar.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserTabBar.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a specialized tab bar for the web browser.
 """

-from PyQt5.QtCore import Qt, QPoint, QTimer, QEvent
-from PyQt5.QtWidgets import QLabel
+from PyQt6.QtCore import Qt, QPoint, QTimer, QEvent
+from PyQt6.QtWidgets import QLabel

 from E5Gui.E5TabWidget import E5WheelTabBar
 from E5Gui.E5PassivePopup import E5PassivePopup, E5PassivePopupStyle
@@ -99,7 +99,7 @@
             i = 0
             tabIndex = -1
             while i < self.count() and tabIndex == -1:
-                if self.tabRect(i).contains(evt.pos()):
+                if self.tabRect(i).contains(evt.position().toPoint()):
                     tabIndex = i
                 i += 1
--- a/eric7/WebBrowser/WebBrowserTabWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserTabWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -9,12 +9,12 @@

 import os

-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice
-from PyQt5.QtGui import QIcon, QPixmap, QPainter
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice
+from PyQt6.QtGui import QIcon, QPixmap, QPainter
+from PyQt6.QtWidgets import (
     QWidget, QHBoxLayout, QMenu, QToolButton, QDialog
 )
-from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
+from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog

 from E5Gui.E5TabWidget import E5TabWidget
 from E5Gui import E5MessageBox
@@ -769,7 +769,7 @@

         @param browser reference to the browser to be printed (WebBrowserView)
         """
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
+        from PyQt6.QtPrintSupport import QPrintPreviewDialog

         if browser is None:
             browser = self.currentBrowser()
--- a/eric7/WebBrowser/WebBrowserView.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserView.py	Sun May 16 20:07:24 2021 +0200
@@ -12,15 +12,15 @@
 import functools
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, QEvent, QPoint,
     QPointF, QDateTime, QStandardPaths, QByteArray, QIODevice, QDataStream
 )
-from PyQt5.QtGui import (
+from PyQt6.QtGui import (
     QDesktopServices, QClipboard, QIcon, QContextMenuEvent, QPixmap, QCursor
 )
-from PyQt5.QtWidgets import QStyle, QMenu, QApplication, QDialog
-from PyQt5.QtWebEngineWidgets import (
+from PyQt6.QtWidgets import QStyle, QMenu, QApplication, QDialog
+from PyQt6.QtWebEngineWidgets import (
     QWebEngineView, QWebEnginePage, QWebEngineDownloadItem
 )

@@ -157,7 +157,7 @@
             self.__selectClientCertificate)
         with contextlib.suppress(AttributeError, ImportError):
             #- Qt >= 5.14
-            from PyQt5.QtWebEngineCore import QWebEngineFindTextResult
+            from PyQt6.QtWebEngineCore import QWebEngineFindTextResult
             # __IGNORE_WARNING__

             self.__page.findTextFinished.connect(
@@ -565,6 +565,7 @@

         if not hitTest.isContentEditable() and not hitTest.isContentSelected():
             self.__menu.addSeparator()
+            # TODO: change this code to add a QMenu
             self.__menu.addAction(self.__mw.adBlockIcon().menuAction())

         self.__menu.addSeparator()
@@ -1411,7 +1412,7 @@
         self.__page.event(evt)
         if (
             not evt.isAccepted() and
-            self.__mw.eventMouseButtons() & Qt.MouseButton.MidButton
+            self.__mw.eventMouseButtons() & Qt.MouseButton.MiddleButton
         ):
             url = QUrl(QApplication.clipboard().text(
                 QClipboard.Mode.Selection))
--- a/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing a web search widget for the web browser.
 """

-from PyQt5.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt
-from PyQt5.QtGui import (
+from PyQt6.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt
+from PyQt6.QtGui import (
     QStandardItem, QStandardItemModel, QFont, QIcon, QPixmap
 )
-from PyQt5.QtWidgets import QMenu, QCompleter
-from PyQt5.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWidgets import QMenu, QCompleter
+from PyQt6.QtWebEngineWidgets import QWebEnginePage

 import UI.PixmapCache
--- a/eric7/WebBrowser/WebBrowserWindow.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWindow.py	Sun May 16 20:07:24 2021 +0200
@@ -13,21 +13,23 @@
 import functools
 import contextlib

-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, QProcess,
     QEvent, QFileInfo
 )
-from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import (
+    QDesktopServices, QKeySequence, QAction, QFont, QFontMetrics
+)
+from PyQt6.QtWidgets import (
     QWidget, QVBoxLayout, QSizePolicy, QDockWidget, QComboBox, QLabel, QMenu,
     QLineEdit, QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar,
-    QInputDialog, QAction
+    QInputDialog
 )
-from PyQt5.QtWebEngineWidgets import (
+from PyQt6.QtWebEngineWidgets import (
     QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript
 )
 try:
-    from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery
+    from PyQt6.QtHelp import QHelpEngine, QHelpEngineCore
     QTHELP_AVAILABLE = True
 except ImportError:
     QTHELP_AVAILABLE = False
@@ -3527,9 +3529,7 @@
         ):
             self.__searchDock.show()
             self.__searchDock.raise_()
-            query = QHelpSearchQuery(QHelpSearchQuery.FieldName.DEFAULT,
-                                     [self.__searchWord])
-            self.__searchEngine.search([query])
+            self.__searchEngine.search(self.__searchWord)
             self.__searchWord = None

     def search(self, word):
--- a/eric7/WebBrowser/WebInspector.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/WebInspector.py	Sun May 16 20:07:24 2021 +0200
@@ -7,8 +7,8 @@
 Module implementing a QWebEngineView to load the web inspector in.
 """

-from PyQt5.QtCore import pyqtSignal, QSize
-from PyQt5.QtWebEngineWidgets import (
+from PyQt6.QtCore import pyqtSignal, QSize
+from PyQt6.QtWebEngineWidgets import (
     QWebEngineView, QWebEnginePage, QWebEngineSettings
 )
--- a/eric7/WebBrowser/ZoomManager/ZoomManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/ZoomManager/ZoomManager.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@
 import json
 import contextlib

-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import pyqtSignal, QObject

 from Utilities.AutoSaver import AutoSaver
 import Preferences
--- a/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -7,9 +7,9 @@
 Module implementing a dialog to show all saved zoom values.
 """

-from PyQt5.QtCore import QSortFilterProxyModel
-from PyQt5.QtGui import QFont, QFontMetrics
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtCore import QSortFilterProxyModel
+from PyQt6.QtGui import QFont, QFontMetrics
+from PyQt6.QtWidgets import QDialog

 from .Ui_ZoomValuesDialog import Ui_ZoomValuesDialog
--- a/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py	Sun May 16 20:07:24 2021 +0200
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel


 class ZoomValuesModel(QAbstractTableModel):
--- a/eric7/eric7.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7.py	Sun May 16 20:07:24 2021 +0200
@@ -25,20 +25,13 @@

 sys.path.insert(1, os.path.dirname(__file__))

-with contextlib.suppress(AttributeError):
-    try:
-        from PyQt5 import sip       # __IGNORE_EXCEPTION__
-    except ImportError:
-        import sip
-    sip.setdestroyonexit(False)
-
 import traceback
 import time
 import logging
 import io

 try:
-    from PyQt5.QtCore import qWarning, QLibraryInfo, QTimer, QCoreApplication
+    from PyQt6.QtCore import qWarning, QLibraryInfo, QTimer, QCoreApplication
 except ImportError:
     try:
         from tkinter import messagebox
@@ -51,7 +44,7 @@
     sys.exit(100)

 with contextlib.suppress(ImportError):
-    from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__

 # some global variables needed to start the application
 args = None
@@ -71,7 +64,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -247,7 +240,7 @@

     sys.excepthook = excepthook

-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7.desktop")

     options = [
@@ -275,7 +268,7 @@
          "(everything after that is considered arguments for this program)")
     ]
     appinfo = AppInfo.makeAppInfo(sys.argv,
-                                  "Eric6",
+                                  "Eric7",
                                   "[project | files... [--] [debug-options]]",
                                   "A Python IDE",
                                   options)
@@ -376,8 +369,8 @@
     # get the Qt translations directory
     qtTransDir = Preferences.getQtTranslationsDir()
     if not qtTransDir:
-        qtTransDir = QLibraryInfo.location(
-            QLibraryInfo.LibraryLocation.TranslationsPath)
+        qtTransDir = QLibraryInfo.path(
+            QLibraryInfo.LibraryPath.TranslationsPath)

     # Load translation files and install them
     loc = Startup.loadTranslators(qtTransDir, app, ("qscintilla",))
--- a/eric7/eric7_browser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_browser.py	Sun May 16 20:07:24 2021 +0200
@@ -14,17 +14,9 @@

 import sys
 import os
-import contextlib

 sys.path.insert(1, os.path.dirname(__file__))

-with contextlib.suppress(AttributeError):
-    try:
-        from PyQt5 import sip       # __IGNORE_EXCEPTION__
-    except ImportError:
-        import sip
-    sip.setdestroyonexit(False)
-
 app = None
 SettingsDir = None

@@ -35,7 +27,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         SettingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(SettingsDir):
             os.makedirs(SettingsDir)
@@ -44,11 +36,11 @@
         sys.argv.remove(arg)

 try:
-    from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
 except ImportError:
     if "--quiet" not in sys.argv:
-        from PyQt5.QtCore import QTimer
-        from PyQt5.QtWidgets import QApplication
+        from PyQt6.QtCore import QTimer
+        from PyQt6.QtWidgets import QApplication
         from E5Gui import E5MessageBox          # __IGNORE_WARNING__
         app = QApplication([])
         QTimer.singleShot(0, lambda: E5MessageBox.critical(
@@ -59,7 +51,7 @@
         app.exec()
     sys.exit(100)

-from PyQt5.QtWebEngineCore import QWebEngineUrlScheme
+from PyQt6.QtWebEngineCore import QWebEngineUrlScheme

 import Globals
 from Globals import AppInfo
@@ -131,7 +123,7 @@
     """
     global app

-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_browser.desktop")

     options = [
--- a/eric7/eric7_compare.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_compare.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -60,7 +60,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_compare.desktop")

     options = [
--- a/eric7/eric7_configure.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_configure.py	Sun May 16 20:07:24 2021 +0200
@@ -22,7 +22,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -53,7 +53,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_configure.desktop")

     options = [
--- a/eric7/eric7_diff.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_diff.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -52,7 +52,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_diff.desktop")

     options = [
--- a/eric7/eric7_editor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_editor.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -55,7 +55,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_editor.desktop")

     options = [
--- a/eric7/eric7_hexeditor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_hexeditor.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -59,7 +59,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_hexeditor.desktop")

     options = [
--- a/eric7/eric7_iconeditor.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_iconeditor.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -59,7 +59,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_iconeditor.desktop")

     options = [
--- a/eric7/eric7_plugininstall.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_plugininstall.py	Sun May 16 20:07:24 2021 +0200
@@ -23,7 +23,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -51,7 +51,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_plugininstall.desktop")

     options = [
--- a/eric7/eric7_pluginrepository.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_pluginrepository.py	Sun May 16 20:07:24 2021 +0200
@@ -23,7 +23,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -51,7 +51,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_pluginrepository.desktop")

     options = [
--- a/eric7/eric7_pluginuninstall.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_pluginuninstall.py	Sun May 16 20:07:24 2021 +0200
@@ -23,7 +23,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -51,7 +51,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_pluginuninstall.desktop")

     options = [
--- a/eric7/eric7_qregularexpression.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_qregularexpression.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -54,7 +54,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_qregularexpression.desktop")

     options = [
--- a/eric7/eric7_re.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_re.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -54,7 +54,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_re.desktop")

     options = [
--- a/eric7/eric7_shell.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_shell.py	Sun May 16 20:07:24 2021 +0200
@@ -25,7 +25,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -54,7 +54,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_shell.desktop")

     options = [
--- a/eric7/eric7_snap.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_snap.py	Sun May 16 20:07:24 2021 +0200
@@ -23,7 +23,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -51,7 +51,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_snap.desktop")

     options = [
--- a/eric7/eric7_sqlbrowser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_sqlbrowser.py	Sun May 16 20:07:24 2021 +0200
@@ -23,7 +23,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -55,7 +55,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_sqlbrowser.desktop")

     options = [
--- a/eric7/eric7_tray.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_tray.py	Sun May 16 20:07:24 2021 +0200
@@ -26,7 +26,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         SettingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(SettingsDir):
             os.makedirs(SettingsDir)
@@ -54,7 +54,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_tray.desktop")

     options = [
--- a/eric7/eric7_trpreviewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_trpreviewer.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -63,7 +63,7 @@
     """
     global app

-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_trpreviewer.desktop")

     options = [
--- a/eric7/eric7_uipreviewer.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_uipreviewer.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -56,7 +56,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_uipreviewer.desktop")

     options = [
--- a/eric7/eric7_unittest.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_unittest.py	Sun May 16 20:07:24 2021 +0200
@@ -24,7 +24,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         settingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(settingsDir):
             os.makedirs(settingsDir)
@@ -56,7 +56,7 @@
     """
     Main entry point into the application.
     """
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_unittest.desktop")

     options = [
--- a/scripts/compileUiFiles.py	Sun May 16 11:43:59 2021 +0200
+++ b/scripts/compileUiFiles.py	Sun May 16 20:07:24 2021 +0200
@@ -10,7 +10,7 @@

 import sys

-from PyQt5.uic import compileUiDir
+from PyQt6.uic import compileUiDir


 def __pyName(py_dir, py_file):
--- a/scripts/install.py	Sun May 16 11:43:59 2021 +0200
+++ b/scripts/install.py	Sun May 16 20:07:24 2021 +0200
@@ -231,8 +231,8 @@
     else:
         # determine dynamically
         try:
-            from PyQt5.QtCore import QLibraryInfo
-            qtDataDir = QLibraryInfo.location(QLibraryInfo.DataPath)
+            from PyQt6.QtCore import QLibraryInfo
+            qtDataDir = QLibraryInfo.path(QLibraryInfo.DataPath)
         except ImportError:
             qtDataDir = None
     apisDir = os.path.join(qtDataDir, "qsci", "api") if qtDataDir else None
@@ -1101,8 +1101,8 @@
     # determine entry for DYLD_FRAMEWORK_PATH
     dyldLine = ""
     try:
-        from PyQt5.QtCore import QLibraryInfo
-        qtLibraryDir = QLibraryInfo.location(QLibraryInfo.LibrariesPath)
+        from PyQt6.QtCore import QLibraryInfo
+        qtLibraryDir = QLibraryInfo.path(QLibraryInfo.LibrariesPath)
     except ImportError:
         qtLibraryDir = ""
     if qtLibraryDir:
@@ -1444,7 +1444,7 @@
         exit(5)

     try:
-        from PyQt5.QtCore import qVersion
+        from PyQt6.QtCore import qVersion
     except ImportError as msg:
         installed = not isSudo and pipInstall(
             "PyQt5>=5.12.1",
@@ -1453,7 +1453,7 @@
         if installed:
             # try to import it again
             try:
-                from PyQt5.QtCore import qVersion
+                from PyQt6.QtCore import qVersion
             except ImportError as msg:
                 print('Sorry, please install PyQt5.')
                 print('Error: {0}'.format(msg))
@@ -1466,7 +1466,7 @@

     try:
         pyuic = "pyuic5"
-        from PyQt5 import uic      # __IGNORE_WARNING__
+        from PyQt6 import uic      # __IGNORE_WARNING__
     except ImportError as msg:
         print("Sorry, {0} is not installed.".format(pyuic))
         print('Error: {0}'.format(msg))
@@ -1474,9 +1474,9 @@
     print("Found {0}".format(pyuic))

     try:
-        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
     except ImportError as msg:
-        from PyQt5.QtCore import PYQT_VERSION
+        from PyQt6.QtCore import PYQT_VERSION
         if PYQT_VERSION >= 0x050c00:
             # PyQt 5.12 separated QtWebEngine into a separate wheel
             if isSudo:
@@ -1489,7 +1489,7 @@
                 )

     try:
-        from PyQt5 import QtChart    # __IGNORE_WARNING__
+        from PyQt6 import QtChart    # __IGNORE_WARNING__
     except ImportError as msg:
         if isSudo:
             print("Optional 'PyQtChart' could not be detected.")
@@ -1501,7 +1501,7 @@
             )

     try:
-        from PyQt5 import Qsci      # __IGNORE_WARNING__
+        from PyQt6 import Qsci      # __IGNORE_WARNING__
     except ImportError as msg:
         installed = not isSudo and pipInstall(
             "QScintilla",
@@ -1510,7 +1510,7 @@
         if installed:
             # try to import it again
             try:
-                from PyQt5 import Qsci      # __IGNORE_WARNING__
+                from PyQt6 import Qsci      # __IGNORE_WARNING__
                 message = None
             except ImportError as msg:
                 message = str(msg)
@@ -1618,7 +1618,7 @@
     # check version of sip
     with contextlib.suppress(ImportError, AttributeError):
         try:
-            from PyQt5 import sip
+            from PyQt6 import sip
         except ImportError:
             import sip
         sipVersion = sip.SIP_VERSION_STR
@@ -1649,7 +1649,7 @@
                     exit(3)

     # check version of PyQt
-    from PyQt5.QtCore import PYQT_VERSION_STR
+    from PyQt6.QtCore import PYQT_VERSION_STR
     pyqtVersion = PYQT_VERSION_STR
     print("PyQt Version:", pyqtVersion.strip())
     # always assume, that snapshots or dev versions are new enough
@@ -1673,7 +1673,7 @@
                 exit(4)

     # check version of QScintilla
-    from PyQt5.Qsci import QSCINTILLA_VERSION_STR
+    from PyQt6.Qsci import QSCINTILLA_VERSION_STR
     scintillaVersion = QSCINTILLA_VERSION_STR
     print("QScintilla Version:", QSCINTILLA_VERSION_STR.strip())
     # always assume, that snapshots or dev versions are new enough
@@ -1709,7 +1709,7 @@
         print("PyQtChart:", QtChart.PYQT_CHART_VERSION_STR)

     with contextlib.suppress(ImportError, AttributeError):
-        from PyQt5 import QtWebEngine
+        from PyQt6 import QtWebEngine
         print("PyQtWebEngine.", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)

     print("All dependencies ok.")
@@ -1732,7 +1732,7 @@
     """
     Compile the .ui files to Python sources.
     """
-    from PyQt5.uic import compileUiDir
+    from PyQt6.uic import compileUiDir
     compileUiDir(eric7SourceDir, True, __pyName)
--- a/scripts/uninstall.py	Sun May 16 11:43:59 2021 +0200
+++ b/scripts/uninstall.py	Sun May 16 20:07:24 2021 +0200
@@ -350,7 +350,7 @@
     Remove the eric configuration directory.
     """
     try:
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
     except ImportError:
         print("No PyQt variant installed. The configuration directory")
         print("cannot be determined. You have to remove it manually.\n")
--- a/setup.py	Sun May 16 11:43:59 2021 +0200
+++ b/setup.py	Sun May 16 20:07:24 2021 +0200
@@ -238,7 +238,7 @@

     @param dirName name of the directory to compile UI files for (string)
     """
-    from PyQt5.uic import compileUiDir
+    from PyQt6.uic import compileUiDir
     compileUiDir(dirName, True, __pyName)