diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-07-09 11:54:00 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-07-09 11:57:48 +0200 |
| commit | 474e904409eaa023e8a397f88d3933b568418174 (patch) | |
| tree | c9c4da4bb443ade97b8f7491f78ae9d66d890e4e | |
| parent | cc05cb1c672259b9dc334b8f114191f79514365c (diff) | |
| download | qutebrowser-474e904409eaa023e8a397f88d3933b568418174.tar.gz qutebrowser-474e904409eaa023e8a397f88d3933b568418174.zip | |
Move OpenGL workaround import
OpenGL.GL gets imported in earlyinit already anyways, so we can move everything
there.
(cherry picked from commit 9e7f2e470f3134eae93854a711a843e162b9b65c)
| -rw-r--r-- | qutebrowser/browser/webengine/webenginesettings.py | 7 | ||||
| -rw-r--r-- | qutebrowser/misc/earlyinit.py | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 493a2a687..936c42033 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -200,13 +200,6 @@ def init(args): if args.enable_webengine_inspector: os.environ['QTWEBENGINE_REMOTE_DEBUGGING'] = str(utils.random_port()) - # Workaround for a black screen with some setups - # https://github.com/spyder-ide/spyder/issues/3226 - if not os.environ.get('QUTE_NO_OPENGL_WORKAROUND'): - # Hide "No OpenGL_accelerate module loaded: ..." message - logging.getLogger('OpenGL.acceleratesupport').propagate = False - from OpenGL import GL # pylint: disable=unused-variable - _init_profiles() # We need to do this here as a WORKAROUND for diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index f5145e015..59cf6a6bf 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -36,6 +36,7 @@ import traceback import signal import importlib import datetime +import logging try: import tkinter except ImportError: @@ -342,7 +343,12 @@ def check_libraries(backend): modules['PyQt5.QtWebEngineWidgets'] = _missing_str("QtWebEngine", webengine=True) modules['PyQt5.QtOpenGL'] = _missing_str("PyQt5.QtOpenGL") - modules['OpenGL.GL'] = _missing_str("PyOpenGL") + # Workaround for a black screen with some setups + # https://github.com/spyder-ide/spyder/issues/3226 + if not os.environ.get('QUTE_NO_OPENGL_WORKAROUND'): + # Hide "No OpenGL_accelerate module loaded: ..." message + logging.getLogger('OpenGL.acceleratesupport').propagate = False + modules['OpenGL.GL'] = _missing_str("PyOpenGL") else: assert backend == 'webkit' modules['PyQt5.QtWebKit'] = _missing_str("PyQt5.QtWebKit") |