Mercurial Repositories > eric / changeset

--- a/eric7/EricWidgets/EricTextEditSearchWidget.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/EricWidgets/EricTextEditSearchWidget.py	Sun Aug 29 12:40:51 2021 +0200
@@ -335,7 +335,7 @@
         @param backwards flag indicating a backwards search
         @type bool
         """
-        from PyQt6.QtWebEngineWidgets import QWebEnginePage
+        from PyQt6.QtWebEngineCore import QWebEnginePage
         
         findFlags = QWebEnginePage.FindFlag(0)
         if self.caseCheckBox.isChecked():

--- a/eric7/Preferences/__init__.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/Preferences/__init__.py	Sun Aug 29 12:40:51 2021 +0200
@@ -31,7 +31,7 @@
 from PyQt6.QtGui import QColor, QFont, QPalette
 from PyQt6.QtWidgets import QApplication
 try:
-    from PyQt6.QtWebEngineWidgets import QWebEngineSettings
+    from PyQt6.QtWebEngineCore import QWebEngineSettings
 except ImportError:
     QWebEngineSettings = None
 from PyQt6.Qsci import QsciScintilla, QsciLexerPython

--- a/eric7/UI/CodeDocumentationViewer.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/UI/CodeDocumentationViewer.py	Sun Aug 29 12:40:51 2021 +0200
@@ -81,9 +81,8 @@
         self.__verticalLayout.setContentsMargins(0, 0, 0, 0)
         
         try:
-            from PyQt6.QtWebEngineWidgets import (
-                QWebEngineView, QWebEngineSettings
-            )
+            from PyQt6.QtWebEngineCore import QWebEngineSettings
+            from PyQt6.QtWebEngineWidgets import QWebEngineView
             self.__contents = QWebEngineView(self)
             self.__contents.page().linkHovered.connect(self.__showLink)
             self.__contents.settings().setAttribute(

--- a/eric7/UI/UserInterface.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sun Aug 29 12:40:51 2021 +0200
@@ -3777,10 +3777,10 @@
                 """<tr><td><b>PyQt6-Charts</b></td><td>{0}</td></tr>"""
             ).format(QtCharts.PYQT_CHART_VERSION_STR)
         with contextlib.suppress(ImportError, AttributeError):
-            from PyQt6 import QtWebEngine
+            from PyQt6 import QtWebEngineCore
             versionText += (
                 """<tr><td><b>PyQt6-WebEngine</b></td><td>{0}</td></tr>"""
-            ).format(QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
+            ).format(QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
         versionText += (
             """<tr><td><b>PyQt6-QScintilla</b></td><td>{0}</td></tr>"""
         ).format(QSCINTILLA_VERSION_STR)

--- a/eric7/Utilities/__init__.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/Utilities/__init__.py	Sun Aug 29 12:40:51 2021 +0200
@@ -1865,9 +1865,9 @@
     except (ImportError, AttributeError):
         info.append("  PyQt6-Charts not installed")
     try:
-        from PyQt6 import QtWebEngine
+        from PyQt6 import QtWebEngineCore
         info.append("  PyQt6-WebEngine {0}".format(
-            QtWebEngine.PYQT_WEBENGINE_VERSION_STR))
+            QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR))
     except (ImportError, AttributeError):
         info.append("  PyQt6-WebEngine not installed")
     info.append("  PyQt6-QScintilla {0}".format(QSCINTILLA_VERSION_STR))

--- a/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Sun Aug 29 12:40:51 2021 +0200
@@ -10,7 +10,7 @@
 from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QCoreApplication
 from PyQt6.QtGui import QCursor
 from PyQt6.QtWidgets import QMenu
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 from EricWidgets.EricModelToolBar import EricModelToolBar
 

--- a/eric7/WebBrowser/Download/DownloadItem.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Download/DownloadItem.py	Sun Aug 29 12:40:51 2021 +0200
@@ -14,7 +14,7 @@
 )
 from PyQt6.QtGui import QPalette, QDesktopServices
 from PyQt6.QtWidgets import QWidget, QStyle, QDialog
-from PyQt6.QtWebEngineWidgets import QWebEngineDownloadItem
+from PyQt6.QtWebEngineCore import QWebEngineDownloadItem
 
 from EricWidgets import EricFileDialog
 

--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Sun Aug 29 12:40:51 2021 +0200
@@ -11,7 +11,7 @@
 
 from PyQt6.QtCore import pyqtSlot, QUrl
 from PyQt6.QtWidgets import QLabel, QHBoxLayout, QPushButton
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 from EricWidgets.EricAnimatedWidget import EricAnimatedWidget
 

--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Sun Aug 29 12:40:51 2021 +0200
@@ -11,7 +11,7 @@
 
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 import Globals
 import Preferences

--- a/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Sun Aug 29 12:40:51 2021 +0200
@@ -11,7 +11,7 @@
 from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QTreeWidget, QAbstractItemView
 )
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 import UI.PixmapCache
 

--- a/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Sun Aug 29 12:40:51 2021 +0200
@@ -14,7 +14,7 @@
 )
 from PyQt6.QtGui import QIcon, QPixmap, QImage
 from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
-from PyQt6.QtWebEngineWidgets import QWebEngineScript
+from PyQt6.QtWebEngineCore import QWebEngineScript
 
 from .GreaseMonkeyJavaScript import bootstrap_js, values_js
 from .GreaseMonkeyDownloader import GreaseMonkeyDownloader

--- a/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Sun Aug 29 12:40:51 2021 +0200
@@ -12,7 +12,7 @@
 import contextlib
 
 from PyQt6.QtCore import QObject, QUrl
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 import Utilities
 

--- a/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Sun Aug 29 12:40:51 2021 +0200
@@ -9,7 +9,7 @@
 
 from PyQt6.QtCore import pyqtSlot, Qt, QPoint
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QMenu
-from PyQt6.QtWebEngineWidgets import QWebEngineCertificateError
+from PyQt6.QtWebEngineCore import QWebEngineCertificateError
 
 from .Ui_SslErrorExceptionsDialog import Ui_SslErrorExceptionsDialog
 

--- a/eric7/WebBrowser/Passwords/PasswordManager.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Passwords/PasswordManager.py	Sun Aug 29 12:40:51 2021 +0200
@@ -13,7 +13,7 @@
     pyqtSignal, QObject, QByteArray, QUrl, QCoreApplication, QXmlStreamReader
 )
 from PyQt6.QtWidgets import QApplication
-from PyQt6.QtWebEngineWidgets import QWebEngineScript
+from PyQt6.QtWebEngineCore import QWebEngineScript
 
 from EricWidgets import EricMessageBox
 from EricWidgets.EricProgressDialog import EricProgressDialog

--- a/eric7/WebBrowser/StatusBar/ImagesIcon.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/StatusBar/ImagesIcon.py	Sun Aug 29 12:40:51 2021 +0200
@@ -14,7 +14,7 @@
 
 from PyQt6.QtCore import pyqtSlot, Qt, QPoint
 from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu
-from PyQt6.QtWebEngineWidgets import QWebEngineSettings
+from PyQt6.QtWebEngineCore import QWebEngineSettings
 
 from .StatusBarIcon import StatusBarIcon
 

--- a/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Sun Aug 29 12:40:51 2021 +0200
@@ -14,7 +14,7 @@
 
 from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QTimer
 from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu, QDialog
-from PyQt6.QtWebEngineWidgets import QWebEngineSettings
+from PyQt6.QtWebEngineCore import QWebEngineSettings
 
 from .StatusBarIcon import StatusBarIcon
 

--- a/eric7/WebBrowser/Tools/WebBrowserTools.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebBrowserTools.py	Sun Aug 29 12:40:51 2021 +0200
@@ -234,7 +234,7 @@
     @return tuple containing the Chrome version and the QtWebEngine version
     @rtype tuple of str
     """
-    from PyQt6.QtWebEngineWidgets import QWebEngineProfile
+    from PyQt6.QtWebEngineCore import QWebEngineProfile
     
     useragent = QWebEngineProfile.defaultProfile().httpUserAgent()
     match = re.search(r"""Chrome/([\d.]+)""", useragent)

--- a/eric7/WebBrowser/Tools/WebHitTestResult.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/Tools/WebHitTestResult.py	Sun Aug 29 12:40:51 2021 +0200
@@ -117,7 +117,7 @@
         @param data context menu data
         @type QWebEngineContextMenuData
         """
-        from PyQt6.QtWebEngineWidgets import QWebEngineContextMenuData
+        from PyQt6.QtWebEngineCore import QWebEngineContextMenuData
         if not data.isValid() or data.position().toPoint() != self.__pos:
             return
         

--- a/eric7/WebBrowser/UrlBar/UrlBar.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/UrlBar/UrlBar.py	Sun Aug 29 12:40:51 2021 +0200
@@ -10,7 +10,7 @@
 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
+from PyQt6.QtWebEngineCore import QWebEnginePage
 try:
     from PyQt6.QtNetwork import QSslCertificate     # __IGNORE_EXCEPTION__
 except ImportError:

--- a/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Sun Aug 29 12:40:51 2021 +0200
@@ -10,7 +10,7 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import QTextEdit, QMenu
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 
 class WebBrowserJavaScriptConsole(QTextEdit):

--- a/eric7/WebBrowser/WebBrowserPage.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Sun Aug 29 12:40:51 2021 +0200
@@ -9,18 +9,13 @@
 """
 
 from PyQt6.QtCore import (
-    pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF,
-    QT_VERSION
+    pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF
 )
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWebEngineWidgets import (
-    QWebEnginePage, QWebEngineSettings, QWebEngineScript
+from PyQt6.QtWebEngineCore import (
+    QWebEnginePage, QWebEngineSettings, QWebEngineScript,
+    PYQT_WEBENGINE_VERSION
 )
-try:
-    from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION
-    # __IGNORE_EXCEPTION__
-except (AttributeError, ImportError):
-    PYQT_WEBENGINE_VERSION = QT_VERSION
 from PyQt6.QtWebChannel import QWebChannel
 
 try:

--- a/eric7/WebBrowser/WebBrowserView.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserView.py	Sun Aug 29 12:40:51 2021 +0200
@@ -20,9 +20,8 @@
     QDesktopServices, QClipboard, QIcon, QContextMenuEvent, QPixmap, QCursor
 )
 from PyQt6.QtWidgets import QStyle, QMenu, QApplication, QDialog
-from PyQt6.QtWebEngineWidgets import (
-    QWebEngineView, QWebEnginePage, QWebEngineDownloadItem
-)
+from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineDownloadItem
+from PyQt6.QtWebEngineWidgets import QWebEngineView
 
 from EricWidgets import EricMessageBox, EricFileDialog
 from EricWidgets.EricApplication import ericApp

--- a/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Sun Aug 29 12:40:51 2021 +0200
@@ -12,7 +12,7 @@
     QStandardItem, QStandardItemModel, QFont, QIcon, QPixmap
 )
 from PyQt6.QtWidgets import QMenu, QCompleter
-from PyQt6.QtWebEngineWidgets import QWebEnginePage
+from PyQt6.QtWebEngineCore import QWebEnginePage
 
 import UI.PixmapCache
 

--- a/eric7/WebBrowser/WebBrowserWindow.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWindow.py	Sun Aug 29 12:40:51 2021 +0200
@@ -25,7 +25,7 @@
     QLineEdit, QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar,
     QInputDialog
 )
-from PyQt6.QtWebEngineWidgets import (
+from PyQt6.QtWebEngineCore import (
     QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript
 )
 try:

--- a/eric7/WebBrowser/WebInspector.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/eric7/WebBrowser/WebInspector.py	Sun Aug 29 12:40:51 2021 +0200
@@ -8,9 +8,8 @@
 """
 
 from PyQt6.QtCore import pyqtSignal, QSize
-from PyQt6.QtWebEngineWidgets import (
-    QWebEngineView, QWebEnginePage, QWebEngineSettings
-)
+from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings
+from PyQt6.QtWebEngineWidgets import QWebEngineView
 
 import Preferences
 

--- a/scripts/install.py	Sun Aug 29 12:40:12 2021 +0200
+++ b/scripts/install.py	Sun Aug 29 12:40:51 2021 +0200
@@ -1704,14 +1704,12 @@
                 exit(5)
     
     # print version info for additional modules
-    # TODO: add info about QtSerialPort once PyQt 6.2.0/Qt 6.2.0 is released
-    #       (only if that is a separate package)
     with contextlib.suppress(NameError, AttributeError):
         print("PyQt6-Charts:", QtCharts.PYQT_CHART_VERSION_STR)
     
     with contextlib.suppress(ImportError, AttributeError):
-        from PyQt6 import QtWebEngine
-        print("PyQt6-WebEngine:", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
+        from PyQt6 import QtWebEngineCore
+        print("PyQt6-WebEngine:", QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
     
     print()
     print("All dependencies ok.")