Mercurial Repositories > eric / file diff

--- 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):
         """