From dad0cfa3eba01b0dff698f457242f80f6eae4698 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 26 Mar 2019 13:27:17 +0100
Subject: [PATCH] Fix style of media audio controls
The modern media controls in 69-based were not completely ready, so
stay with the legacy media controls until 5.13.
Fixes: QTBUG-74484
Change-Id: I06de16d8210341443a10d8c984f1978d373de0d9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
src/core/web_engine_context.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index edae5c47d..4af486456 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -73,6 +73,7 @@
#include "gpu/command_buffer/service/gpu_switches.h"
#include "gpu/ipc/host/gpu_switches.h"
#include "media/audio/audio_manager.h"
+#include "media/base/media_switches.h"
#include "mojo/core/embedder/embedder.h"
#include "net/base/port_util.h"
#include "ppapi/buildflags/buildflags.h"
@@ -451,6 +452,9 @@ WebEngineContext::WebEngineContext()
appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kMojoVideoCapture.name);
// We do not yet support the internal video capture API.
appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, features::kUseVideoCaptureApiForDevToolsSnapshots.name);
+ // Qt 5.12 only: The modern media controls are not yet good enough in 69-based,
+ // so we stick to the old style
+ appendToFeatureSwitch(parsedCommandLine, switches::kDisableFeatures, media::kUseModernMediaControls.name);
if (useEmbeddedSwitches) {
// embedded switches are based on the switches for Android, see content/browser/android/content_startup_flags.cc
--
GitLab