summaryrefslogtreecommitdiff
path: root/qutebrowser
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2023-06-23 23:38:54 +0200
committerFlorian Bruhin <me@the-compiler.org>2023-06-30 19:29:28 +0200
commit73fb5c4c49a9f79b1820486dc11e819f859d593a (patch)
treeef75c38635b1414c975cc5f8e4e3e7b587188ff3 /qutebrowser
parentad77048d530aefeecdd1c784accaddb929f8bdc6 (diff)
downloadqutebrowser-73fb5c4c49a9f79b1820486dc11e819f859d593a.tar.gz
qutebrowser-73fb5c4c49a9f79b1820486dc11e819f859d593a.zip
qt: Switch to autoselection of Qt backend by default
Diffstat (limited to 'qutebrowser')
-rw-r--r--qutebrowser/qt/machinery.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py
index bd5062120..a5705a933 100644
--- a/qutebrowser/qt/machinery.py
+++ b/qutebrowser/qt/machinery.py
@@ -150,7 +150,7 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo:
- If --qt-wrapper is given, use that.
- Otherwise, if the QUTE_QT_WRAPPER environment variable is set, use that.
- - Otherwise, use PyQt5 (FIXME:qt6 autoselect).
+ - Otherwise, try the wrappers in WRAPPER in order (PyQt6 -> PyQt5)
"""
# If any Qt wrapper has been imported before this, something strange might
# be happening.
@@ -174,11 +174,9 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo:
)
return SelectionInfo(wrapper=env_wrapper, reason=SelectionReason.env)
- # FIXME:qt6 Go back to the auto-detection once ready
# FIXME:qt6 Make sure to still consider _DEFAULT_WRAPPER for packagers
# (rename to _WRAPPER_OVERRIDE since our sed command is broken anyways then?)
- # return _autoselect_wrapper()
- return SelectionInfo(wrapper=_DEFAULT_WRAPPER, reason=SelectionReason.default)
+ return _autoselect_wrapper()
# Values are set in init(). If you see a NameError here, it means something tried to