Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	.qmake.conf
	src/core/compositor/display_gl_output_surface_qsg.cpp
	src/core/web_engine_context.cpp
	tests/auto/quick/quick.pro

Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235

1 files changed, 3 insertions, 2 deletions

diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index da0c70af5..2a5666776 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -660,6 +660,9 @@ WebEngineContext::WebEngineContext()
 
     parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing);
 
+    // Do not advertise a feature we have removed at compile time
+    parsedCommandLine->AppendSwitch(switches::kDisableSpeechAPI);
+
     std::string disableFeatures;
     std::string enableFeatures;
     // Needed to allow navigations within pages that were set using setHtml(). One example is
@@ -689,8 +692,6 @@ WebEngineContext::WebEngineContext()
     // Explicitly tell Chromium about default-on features we do not support
     appendToFeatureList(disableFeatures, features::kBackgroundFetch.name);
     appendToFeatureList(disableFeatures, features::kSmsReceiver.name);
-    appendToFeatureList(disableFeatures, features::kWebAuth.name);
-    appendToFeatureList(disableFeatures, features::kWebAuthCable.name);
     appendToFeatureList(disableFeatures, features::kWebPayments.name);
     appendToFeatureList(disableFeatures, features::kWebUsb.name);
     appendToFeatureList(disableFeatures, media::kPictureInPicture.name);