Mercurial Repositories > eric / file diff

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