From 1b6457bb93aabc324495d1f0b1bef85762d56451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Thu, 14 Nov 2019 14:25:58 +0100 Subject: Enable viz unless --disable-viz-display-compositor is given Since we now support running the GPU service on the UI thread even with viz, there's no longer any need for a --enable-viz-display-compositor flag. Fixes: QTBUG-79864 Change-Id: I86f6282a17e1e0ed56a91373eb2a2753085e981a Reviewed-by: Allan Sandfeld Jensen --- src/core/web_engine_context.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 88f5be726..17742e1d7 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -569,10 +569,8 @@ WebEngineContext::WebEngineContext() #endif threadedGpu = threadedGpu && !qEnvironmentVariableIsSet(kDisableInProcGpuThread); - bool enableViz = ((threadedGpu && !parsedCommandLine->HasSwitch("disable-viz-display-compositor")) - || parsedCommandLine->HasSwitch("enable-viz-display-compositor")); + bool enableViz = !parsedCommandLine->HasSwitch("disable-viz-display-compositor"); parsedCommandLine->RemoveSwitch("disable-viz-display-compositor"); - parsedCommandLine->RemoveSwitch("enable-viz-display-compositor"); std::string disableFeatures; std::string enableFeatures; -- cgit v1.2.3