diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-21 09:11:30 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-30 10:10:27 +0200 |
| commit | 904330c3a39a29ef078c9c1ddc2a1d1580fa2c32 (patch) | |
| tree | 7138aeb6f2d198b150c6bda1a40f77b116ad761d | |
| parent | a283bf53c4cc81ec14d19a492c412191394b350c (diff) | |
Do not turn web auth off
Submodule src/3rdparty 0a4240a9..4a996760:
> Fix building FIDO with gcc5
> [Backport] CVE-2020-6512: Type Confusion in V8 (3/3)
Fixes: QTBUG-85117
Task-number: QTBUG-54720
Change-Id: I074831454b469c17a71f2ca75a075ee48157970d
Reviewed-by: Tamas Zakor <ztamas@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/buildtools/config/common.pri | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 0a4240a9c428d71656637ad4486d92bfeb52af9 +Subproject 4a996760680eb99732d172463b2a8288e67c8cc diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index 8aeeb3894..ddcd225cc 100644 --- a/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri @@ -17,7 +17,7 @@ gn_args += \ enable_resource_whitelist_generation=false \ enable_swiftshader=false \ angle_enable_swiftshader=false \ - enable_web_auth=false \ + enable_web_auth=true \ enable_web_speech=false \ enable_widevine=true \ has_native_accessibility=false \ diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 01d55a5a1..11365de62 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -649,8 +649,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); |