diff options
| -rw-r--r-- | qutebrowser/browser/eventfilter.py | 15 | ||||
| -rw-r--r-- | qutebrowser/misc/backendproblem.py | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/qutebrowser/browser/eventfilter.py b/qutebrowser/browser/eventfilter.py index 6404608b3..1cff11ac4 100644 --- a/qutebrowser/browser/eventfilter.py +++ b/qutebrowser/browser/eventfilter.py @@ -9,9 +9,8 @@ from qutebrowser.qt.core import QObject, QEvent, Qt, QTimer from qutebrowser.qt.widgets import QWidget from qutebrowser.config import config -from qutebrowser.utils import log, message, usertypes, qtutils, version, utils +from qutebrowser.utils import log, message, usertypes, qtutils from qutebrowser.keyinput import modeman -from qutebrowser.misc import objects class ChildEventFilter(QObject): @@ -37,6 +36,11 @@ class ChildEventFilter(QObject): """Act on ChildAdded events.""" if event.type() == QEvent.Type.ChildAdded: child = event.child() + if not isinstance(child, QWidget): + # Can e.g. happen when dragging text + log.misc.debug(f"Ignoring new child {qtutils.qobj_repr(child)}") + return False + log.misc.debug( f"{qtutils.qobj_repr(obj)} got new child {qtutils.qobj_repr(child)}, " "installing filter") @@ -59,12 +63,7 @@ class ChildEventFilter(QObject): c.metaObject() is not None and c.metaObject().className() == "QQuickWidget" ] - if ( - children and - objects.backend == usertypes.Backend.QtWebEngine and - version.qtwebengine_versions().webengine >= - utils.VersionNumber(6, 4) - ): + if children: log.misc.debug("Focusing new child") child.setFocus() diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py index e4e9a84af..51d3a35c3 100644 --- a/qutebrowser/misc/backendproblem.py +++ b/qutebrowser/misc/backendproblem.py @@ -234,6 +234,13 @@ class _BackendProblemChecker: errbox.exec() sys.exit(usertypes.Exit.err_init) + # Doing this here because it's not relevant with QtWebKit where fatal=True + if machinery.IS_QT6: + text += ("\nHint: If installed via mkvenv.py on a system without " + "OpenSSL 3.x (e.g. Ubuntu 20.04), you can use --pyqt-version 6.4 " + "to get an older Qt still compatible with OpenSSL 1.1 (at the " + "expense of running an older QtWebEngine/Chromium)") + assert not fatal log.init.warning(text) |