diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-02-16 17:57:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-07-06 11:40:10 +0200 |
| commit | d488349ee0ecac8a2e5a87a18d249c7b5de39152 (patch) | |
| tree | 95620d441c5be608127f976428f440636472d166 /cmake | |
| parent | 09ab9ab74efcd0da0a310c992629bc650a5a80ec (diff) | |
Adaptations for Chromium 110
Pick-to: 6.6
Change-Id: I56e1695ee4fc2b0e12da6580a5673df80bba8b6d
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index e79811346..b852a809b 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -855,7 +855,8 @@ macro(append_build_type_setup) forbid_non_component_debug_builds=false treat_warnings_as_errors=false use_allocator_shim=false - use_allocator="none" + use_partition_alloc=true + use_partition_alloc_as_malloc=false use_custom_libcxx=false ) if(${config} STREQUAL "Debug") @@ -878,7 +879,7 @@ macro(append_build_type_setup) if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer) list(APPEND gnArgArg is_official_build=false - from_here_uses_location_builtins=false + use_viz_debugger=false ) else() list(APPEND gnArgArg is_official_build=true) |