diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:28:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:28:29 +0100 |
| commit | 91fc86bef3b9eb9467f6ac251d1953483da93185 (patch) | |
| tree | 616f5dd534f4ddc86675047bac4eb3f4287085d1 /src/core/web_engine_context.cpp | |
| parent | 51228eb249a178ada6ebd2ccd5e662bcd7bd2c60 (diff) | |
| parent | 556576b55f6b4404c71c74a5ef8e21f87ed09854 (diff) | |
Merge remote-tracking branch 'origin/5.13.2' into 5.13
Change-Id: I5c95819f139bb0995475324bd33dab478802db59
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 a3a5881bf..07e0d3ba8 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -362,6 +362,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) { @@ -608,6 +609,7 @@ WebEngineContext::WebEngineContext() #ifndef QT_NO_OPENGL threadedGpu = QOpenGLContext::supportsThreadedOpenGL(); #endif + threadedGpu = threadedGpu && !qEnvironmentVariableIsSet(kDisableInProcGpuThread); registerMainThreadFactories(threadedGpu); SetContentClient(new ContentClientQt); |