diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 15:45:50 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-30 16:17:37 +0100 |
| commit | 4cf520d67f0619330bbf53a743818924d476d95f (patch) | |
| tree | 58e13e6747affa06bf495c25c8dc7e272a428ba3 /src/core/web_engine_context.cpp | |
| parent | 21f10e777ee2faf41196d0263d4e5134d0ec216a (diff) | |
| parent | 91fc86bef3b9eb9467f6ac251d1953483da93185 (diff) | |
Merge branch '5.13' into 5.14
Change-Id: I6ab2e949cb2fa3b2db55a1654d42667db6257eab
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 243774fb7..a4ceb3a97 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -378,6 +378,7 @@ ProxyAuthentication WebEngineContext::qProxyNetworkAuthentication(QString host, const static char kChromiumFlagsEnv[] = "QTWEBENGINE_CHROMIUM_FLAGS"; const static char kDisableSandboxEnv[] = "QTWEBENGINE_DISABLE_SANDBOX"; +const static char kDisableInProcGpuThread[] = "QTWEBENGINE_DISABLE_GPU_THREAD"; static void appendToFeatureList(std::string &featureList, const char *feature) { @@ -508,6 +509,7 @@ WebEngineContext::WebEngineContext() #ifndef QT_NO_OPENGL threadedGpu = QOpenGLContext::supportsThreadedOpenGL(); #endif + threadedGpu = threadedGpu && !qEnvironmentVariableIsSet(kDisableInProcGpuThread); bool enableViz = ((threadedGpu && !parsedCommandLine->HasSwitch("disable-viz-display-compositor")) || parsedCommandLine->HasSwitch("enable-viz-display-compositor")); |