Adjust Qt/PyQt version ranges
This commit is contained in:
parent
4de0e90fd0
commit
42f5902ba6
|
|
@ -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]
|
||||
|
||||
|
|
|
|||
|
|
@ -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."""
|
||||
|
|
|
|||
Loading…
Reference in New Issue