summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-04-26 10:57:22 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-04-27 12:00:30 +0200
commit99048fb466dc26593a35ae936c9f3cf72051e08e (patch)
tree06cdd60bf166e2ec54c663566781af255b56037c
parentfcba944503a5e1aaffd0cdd53ae76e3577ce2494 (diff)
downloadqutebrowser-99048fb466dc26593a35ae936c9f3cf72051e08e.tar.gz
qutebrowser-99048fb466dc26593a35ae936c9f3cf72051e08e.zip
Update old Qt version warning
See #3839
-rw-r--r--README.asciidoc4
-rw-r--r--qutebrowser/app.py2
-rw-r--r--qutebrowser/html/warning-old-qt.html20
-rw-r--r--qutebrowser/utils/version.py2
4 files changed, 18 insertions, 10 deletions
diff --git a/README.asciidoc b/README.asciidoc
index 9e2a61a22..a86be572d 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -106,7 +106,7 @@ Requirements
The following software and libraries are required to run qutebrowser:
* https://www.python.org/[Python] 3.5.2 or newer (3.6 recommended)
-* https://www.qt.io/[Qt] 5.7.1 or newer (5.14 recommended; support for < 5.9
+* https://www.qt.io/[Qt] 5.7.1 or newer (5.14 recommended; support for < 5.11
will be dropped soon) with the following modules:
- QtCore / qtbase
- QtQuick (part of qtbase in some distributions)
@@ -120,7 +120,7 @@ The following software and libraries are required to run qutebrowser:
avoid visiting untrusted websites and using it for transmission of
sensitive data.**
* https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
- (5.14 recommended, support for < 5.9 will be dropped soon) for Python 3
+ (5.14 recommended, support for < 5.11 will be dropped soon) for Python 3
* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
* https://fdik.org/pyPEG/[pyPEG2]
* http://jinja.pocoo.org/[jinja2]
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 445593706..9d38071bf 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -334,7 +334,7 @@ def _open_special_pages(args):
'qute://warning/webkit'),
('old-qt-warning-shown',
- not qtutils.version_check('5.9'),
+ not qtutils.version_check('5.11'),
'qute://warning/old-qt'),
]
diff --git a/qutebrowser/html/warning-old-qt.html b/qutebrowser/html/warning-old-qt.html
index 157d50714..e5da57548 100644
--- a/qutebrowser/html/warning-old-qt.html
+++ b/qutebrowser/html/warning-old-qt.html
@@ -7,18 +7,26 @@ qute://warning/old-qt</span> to show it again at a later time.</span>
<p>You're using qutebrowser with Qt {{qt_version}}.</p>
+{% if qt_version.startswith('5.7.') %}
<p>Qt 5.7 was released in June 2016, with the 5.7.1 patch release in December
2016. It is based on Chromium 49 (March 2016) with (some) security fixes up to
-Chromium 54 (October 2016). It is also
-<a href="https://www.debian.org/releases/stable/amd64/release-notes/ch-information.en.html#browser-security">not covered</a>
-by Debian security updates.</p>
-
+Chromium 54 (October 2016).</p>
+{% elif qt_version.startswith('5.8.') %}
<p>Qt 5.8 has had various bugs, and has been unsupported (but working to some
degree) in qutebrowser for a while.</p>
+{% elif qt_version.startswith('5.9.') %}
+<p>Qt 5.9 LTS was released in May 2017 and is based on Chromium 56 (January 2017). It is a long term support release with the 5.9.9 patch release in December 2019 including (some) security fixes up to Chromium 78 (November 2019). However, its usage was found to be low, and the next LTS (Qt 5.12) was released in December 2018.</p>
+{% elif qt_version.startswith('5.10.') %}
+<p>Qt 5.10 was released in December 2017, with the 5.10.1 patch release in February
+2018. It is based on Chromium 65 (March 2018) with (some) security fixes up to
+Chromium 70 (November 2018).</p>
+{% endif %}
+
+Also, note that QtWebEngine is <a href="https://www.debian.org/releases/stable/amd64/release-notes/ch-information.en.html#browser-security">not covered</a> by Debian security updates.
<p>Because of those security issues and the maintaince burden coming with
-supporting old versions, support for Qt < 5.9 will be dropped in a future
-qutebrowser release. You might want to check
+supporting old versions, support for Qt < 5.11 will be dropped in qutebrowser
+v2.0. You might want to check
<a href="https://qutebrowser.org/doc/install.html">alternate installation methods</a>
which allow you to get a newer Qt.</p>
{% endblock %}
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index d10c57411..4b88570ed 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -343,7 +343,7 @@ def _chromium_version() -> str:
Qt 5.9: Chromium 56
(LTS) 56.0.2924.122 (2017-01-25)
- 5.9.8: Security fixes up to 72.0.3626.121 (2019-03-01)
+ 5.9.9: Security fixes up to 78.0.3904.108 (2019-11-18)
Qt 5.10: Chromium 61
61.0.3163.140 (2017-09-05)