summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2019-11-14 14:25:58 +0100
committerMichal Klocek <michal.klocek@qt.io>2020-04-14 08:54:24 +0200
commit1b6457bb93aabc324495d1f0b1bef85762d56451 (patch)
treea6bbbe6f98ae408109bb3104f8685d9a56bffd01 /src/core/web_engine_context.cpp
parente6d4d15b03fa67524269bc8e1beb04dcc704db03 (diff)
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 <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r--src/core/web_engine_context.cpp4
1 files changed, 1 insertions, 3 deletions
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;