From 40b26d749276f9f48aa790a97e51a47618397cc1 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 19 Sep 2017 08:16:26 +0200 Subject: [PATCH] Always require QtOpenGL It makes it a bit easier to explain things, and it makes the transition to QtWebEngine smoother. --- doc/changelog.asciidoc | 1 + qutebrowser/misc/earlyinit.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 9cd0c4792..8c4cbcf79 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -30,6 +30,7 @@ Breaking changes - New config system which ignores the old config file. - The depedency on PyOpenGL (when using QtWebEngine) got removed. Note that PyQt5.QtOpenGL is still a dependency. +- PyQt5.QtOpenGL is now always required, even with QtWebKit. - Migrating QtWebEngine data written by versions before 2016-11-15 (before v0.9.0) is now not supported anymore. - Upgrading qutebrowser with a version older than v0.4.0 still running now won't diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index d2fb65ced..058a66882 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -263,6 +263,7 @@ def check_libraries(): pip="PyYAML"), 'PyQt5.QtQml': _missing_str("PyQt5.QtQml"), 'PyQt5.QtSql': _missing_str("PyQt5.QtSql"), + 'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"), } _check_modules(modules) @@ -278,7 +279,6 @@ def check_backend_libraries(backend): modules = { 'PyQt5.QtWebEngineWidgets': _missing_str("QtWebEngine", webengine=True), - 'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"), } else: assert backend == usertypes.Backend.QtWebKit, backend