diff options
Diffstat (limited to 'qutebrowser/browser/webengine/webengineelem.py')
| -rw-r--r-- | qutebrowser/browser/webengine/webengineelem.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py index 75b7a51ba..2e348055c 100644 --- a/qutebrowser/browser/webengine/webengineelem.py +++ b/qutebrowser/browser/webengine/webengineelem.py @@ -22,9 +22,9 @@ from typing import ( TYPE_CHECKING, Any, Callable, Dict, Iterator, Optional, Set, Tuple, Union) -from PyQt5.QtCore import QRect, QEventLoop -from PyQt5.QtWidgets import QApplication -from PyQt5.QtWebEngineWidgets import QWebEngineSettings +from qutebrowser.qt.core import QRect, QEventLoop +from qutebrowser.qt.widgets import QApplication +from qutebrowser.qt.webenginecore import QWebEngineSettings from qutebrowser.utils import log, javascript, urlutils, usertypes, utils from qutebrowser.browser import webelem @@ -231,7 +231,6 @@ class WebEngineElement(webelem.AbstractWebElement): return url.scheme() not in urlutils.WEBENGINE_SCHEMES def _click_editable(self, click_target: usertypes.ClickTarget) -> None: - self._tab.setFocus() # Needed as WORKAROUND on Qt 5.12 # This actually "clicks" the element by calling focus() on it in JS. self._js_call('focus') self._move_text_cursor() @@ -242,7 +241,7 @@ class WebEngineElement(webelem.AbstractWebElement): view = self._tab._widget assert view is not None # pylint: enable=protected-access - attribute = QWebEngineSettings.JavascriptCanOpenWindows + attribute = QWebEngineSettings.WebAttribute.JavascriptCanOpenWindows could_open_windows = view.settings().testAttribute(attribute) view.settings().setAttribute(attribute, True) @@ -251,8 +250,8 @@ class WebEngineElement(webelem.AbstractWebElement): # This is also used in Qt's tests: # https://github.com/qt/qtwebengine/commit/5e572e88efa7ba7c2b9138ec19e606d3e345ac90 QApplication.processEvents( - QEventLoop.ExcludeSocketNotifiers | - QEventLoop.ExcludeUserInputEvents) + QEventLoop.ProcessEventsFlag.ExcludeSocketNotifiers | + QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents) def reset_setting(_arg: Any) -> None: """Set the JavascriptCanOpenWindows setting to its old value.""" |