summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2017-07-08 17:36:14 +0200
committerFlorian Bruhin <git@the-compiler.org>2017-07-08 17:37:44 +0200
commitcc05cb1c672259b9dc334b8f114191f79514365c (patch)
treef5d450819fde8c62f6fb0bfb478cdb4ea427317f
parente10ce420ab6f08fcd2dda4fb960f840623c7da89 (diff)
downloadqutebrowser-cc05cb1c672259b9dc334b8f114191f79514365c.tar.gz
qutebrowser-cc05cb1c672259b9dc334b8f114191f79514365c.zip
Recommend QT_XCB_FORCE_SOFTWARE_OPENGL
This won't disable OpenGL for stuff started from qutebrowser. See #2368. (cherry picked from commit fcf5158258be10194d59486538d4bf091a6a035a)
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 0a4c2dfc7..e4b5eba09 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -51,12 +51,13 @@ def init():
global _qute_scheme_handler
app = QApplication.instance()
- software_rendering = os.environ.get('LIBGL_ALWAYS_SOFTWARE') == '1'
+ software_rendering = (os.environ.get('LIBGL_ALWAYS_SOFTWARE') == '1' or
+ 'QT_XCB_FORCE_SOFTWARE_OPENGL' in os.environ)
if version.opengl_vendor() == 'nouveau' and not software_rendering:
# FIXME:qtwebengine display something more sophisticated here
raise browsertab.WebTabError(
"QtWebEngine is not supported with Nouveau graphics (unless "
- "LIBGL_ALWAYS_SOFTWARE is set as environment variable).")
+ "QT_XCB_FORCE_SOFTWARE_OPENGL is set as environment variable).")
log.init.debug("Initializing qute://* handler...")
_qute_scheme_handler = webenginequtescheme.QuteSchemeHandler(parent=app)