diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-03 16:01:24 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:07 +0200 |
commit | cd61343ceb4a3de8ce16082917a2f197b2481d08 (patch) | |
tree | ae88767edf6b3dc07b8dcf54c97a779eb2812768 /src/buildtools | |
parent | fc3893ea80296bd17e1797d5caf4479e0be4afd1 (diff) |
Chromium 81-based adaptations
Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/buildtools')
-rw-r--r-- | src/buildtools/config/common.pri | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index ddcd225cc..c184024e8 100644 --- a/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri @@ -5,7 +5,6 @@ QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private gn_args += \ use_qt=true \ - closure_compile=false \ is_component_build=false \ is_shared=true \ enable_debugallocation=false \ @@ -20,17 +19,27 @@ gn_args += \ enable_web_auth=true \ enable_web_speech=false \ enable_widevine=true \ + forbid_non_component_debug_builds=false \ has_native_accessibility=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 \ - forbid_non_component_debug_builds=false + use_custom_libcxx=false + +# No closure compile supported at this time +gn_args += \ + closure_compile=false \ + optimize_webui=false + +# We always embed v8 startup data currently +gn_args += \ + v8_use_external_startup_data=false + +# Uses special flags for clang not available on xcode, and messes up gdb debugging too. +gn_args += \ + strip_absolute_paths_from_debug_symbols=false greaterThan(QMAKE_JUMBO_MERGE_LIMIT,0) { gn_args += \ |