diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-13 13:54:17 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-28 14:24:35 +0100 |
| commit | 42af15c421a520499bc872e2d55053dcffb2a07b (patch) | |
| tree | c0e8836daec4903254c7ae633eb8ef27a4502f00 /src/buildtools | |
| parent | 01d4c6440b52f2ce26ced45b6ad193e909db44af (diff) | |
Adaptations for Chromium 78
Including removal of renderer service.
[ChangeLog][QWebEngineSetting] XSS Auditing has been removed, and
XSSAuditingEnabled no longer has any effect.
Change-Id: I0835e2a76551057f3eea30a343e0373b642192f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/common.pri | 11 | ||||
| -rw-r--r-- | src/buildtools/config/linux.pri | 2 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index 9cd8cb089..ae15aaa71 100644 --- a/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri @@ -8,6 +8,7 @@ gn_args += \ closure_compile=false \ is_component_build=false \ is_shared=true \ + enable_debugallocation=false \ enable_message_center=false \ enable_nacl=false \ enable_remoting=false \ @@ -18,15 +19,15 @@ gn_args += \ enable_web_speech=false \ enable_widevine=true \ has_native_accessibility=false \ - enable_debugallocation=false \ + optimize_webui=false \ + safe_browsing_mode=0 \ + strip_absolute_paths_from_debug_symbols=false \ + toolkit_views=false \ + treat_warnings_as_errors=false \ use_allocator_shim=false \ use_allocator=\"none\" \ use_custom_libcxx=false \ v8_use_external_startup_data=false \ - toolkit_views=false \ - treat_warnings_as_errors=false \ - safe_browsing_mode=0 \ - optimize_webui=false \ forbid_non_component_debug_builds=false greaterThan(QMAKE_JUMBO_MERGE_LIMIT,0) { diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index add563f28..2aa345c21 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -17,8 +17,6 @@ gn_args += \ use_sysroot=false \ enable_session_service=false \ is_cfi=false \ - strip_absolute_paths_from_debug_symbols=false \ - toolkit_views=false \ use_ozone=true \ ozone_auto_platforms=false \ ozone_platform_headless=false \ diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index d6c47dfc6..c2531a744 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -264,10 +264,11 @@ "main": [ "vpx_codec_cx_pkt pkt;", "pkt.data.frame.width[0] = 0u;", - "pkt.data.frame.height[0] = 0u;" + "pkt.data.frame.height[0] = 0u;", + "auto a = CONSTRAINED_FROM_ABOVE_DROP;" ] }, - "headers": "vpx/vpx_encoder.h", + "headers": [ "vpx/vpx_encoder.h", "vpx/vp8cx.h" ], "sources": [ { "type": "pkgConfig", "args": "vpx" }, "-lvpx" |