summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-06-29 10:34:28 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-06-29 10:42:02 +0200
commita4e40d97dc6fdae0ef11e9636a6fc34c1092a236 (patch)
tree4d745c9d120edf2d640133091d431fd17253290a
parent3c2a543425cf086e6d2bd8176e1ba98318b27f71 (diff)
downloadqutebrowser-a4e40d97dc6fdae0ef11e9636a6fc34c1092a236.tar.gz
qutebrowser-a4e40d97dc6fdae0ef11e9636a6fc34c1092a236.zip
Disable shared workers wtih Qt 5.14
See https://bugreports.qt.io/browse/QTBUG-82105 Fixes #5279 (cherry picked from commit 27c657350872e098fcb6d2f6d975a4557f23bab6)
-rw-r--r--qutebrowser/config/configinit.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py
index 98aa69257..8250db19f 100644
--- a/qutebrowser/config/configinit.py
+++ b/qutebrowser/config/configinit.py
@@ -285,10 +285,16 @@ def _darkmode_settings() -> typing.Iterator[typing.Tuple[str, str]]:
def _qtwebengine_args(namespace: argparse.Namespace) -> typing.Iterator[str]:
"""Get the QtWebEngine arguments to use based on the config."""
- if not qtutils.version_check('5.11', compiled=False):
+ is_qt_514 = (qtutils.version_check('5.14', compiled=False) and
+ not qtutils.version_check('5.15', compiled=False))
+
+ if not qtutils.version_check('5.11', compiled=False) or is_qt_514:
# WORKAROUND equivalent to
# https://codereview.qt-project.org/#/c/217932/
# Needed for Qt < 5.9.5 and < 5.10.1
+ #
+ # For Qt 5,14, WORKAROUND for
+ # https://bugreports.qt.io/browse/QTBUG-82105
yield '--disable-shared-workers'
# WORKAROUND equivalent to