diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-05-30 11:47:12 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-06-22 17:41:12 +0200 |
| commit | b7a8df3930de6b139842c0b34c62eee2bc6ad2d1 (patch) | |
| tree | d53bd00318935869af164e0aa9652e3cfda2b529 | |
| parent | d654490f62af0c30aa0c698a0663a721e941e5dd (diff) | |
| download | qutebrowser-b7a8df3930de6b139842c0b34c62eee2bc6ad2d1.tar.gz qutebrowser-b7a8df3930de6b139842c0b34c62eee2bc6ad2d1.zip | |
Adjust Qt/PyQt version ranges
| -rw-r--r-- | README.asciidoc | 11 | ||||
| -rw-r--r-- | qutebrowser/misc/earlyinit.py | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/README.asciidoc b/README.asciidoc index 8de42db20..046fd922d 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -72,20 +72,17 @@ https://www.the-compiler.org/pubkey.asc[0x916eb0c8fd55a072]. Requirements ------------ -// FIXME:qt6 update this - The following software and libraries are required to run qutebrowser: * https://www.python.org/[Python] 3.7 or newer -* https://www.qt.io/[Qt] 5.15.0 or newer (5.15 LTS recommended, Qt 6 is - not supported yet) with the following modules: +* https://www.qt.io/[Qt], either 6.2.0 or newer, or 5.15.0 or newer, with the following modules: - QtCore / qtbase - QtQuick (part of qtbase or qtdeclarative in some distributions) - QtSQL (part of qtbase in some distributions) - QtDBus (part of qtbase in some distributions; note that a connection to DBus at runtime is optional) - QtOpenGL - - QtWebEngine (5.15.2 or newer), or + - QtWebEngine (if using Qt 5, 5.15.2 or newer), or - alternatively QtWebKit (5.212) - **This is not recommended** due to known security issues in QtWebKit, you most likely want to use qutebrowser with the default QtWebEngine backend (based on Chromium) instead. Quoting the @@ -93,8 +90,8 @@ The following software and libraries are required to run qutebrowser: _[The latest QtWebKit] release is based on [an] old WebKit revision with known unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted websites and using it for transmission of sensitive data._ -* https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.15.0 or newer - for Python 3 +* https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 6.2.2 or newer + (Qt 6) or 5.15.0 or newer (Qt 5) * https://palletsprojects.com/p/jinja/[jinja2] * https://github.com/yaml/pyyaml[PyYAML] diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 2989a1ef0..ad12c9709 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -189,12 +189,17 @@ def check_qt_version(): # QVersionNumber was added in Qt 5.6, QLibraryInfo.version() in 5.8 recent_qt_runtime = False - if QT_VERSION < 0x050F00 or PYQT_VERSION < 0x050500 or not recent_qt_runtime: + if QT_VERSION < 0x050F00 or PYQT_VERSION < 0x050F00 or not recent_qt_runtime: text = ("Fatal error: Qt >= 5.15.0 and PyQt >= 5.15.0 are required, " "but Qt {} / PyQt {} is installed.".format(qt_version(), PYQT_VERSION_STR)) _die(text) + if 0x060000 <= PYQT_VERSION < 0x060202: + text = ("Fatal error: With Qt 6, PyQt >= 6.2.2 is required, but " + "{} is installed.".format(PYQT_VERSION_STR)) + _die(text) + def check_ssl_support(): """Check if SSL support is available.""" |