diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 14:17:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:26:38 +0200 |
| commit | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch) | |
| tree | 4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/config | |
| parent | 0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff) | |
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 9 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/mac_osx.pri | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 18bd358f3..dea904ef8 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -12,6 +12,7 @@ gn_args += \ enable_nacl=false \ enable_remoting=false \ enable_reporting=false \ + enable_resource_whitelist_generation=false \ enable_swiftshader=false \ enable_web_auth=false \ enable_web_speech=false \ @@ -93,11 +94,15 @@ CONFIG(release, debug|release) { CONFIG(debug, debug|release) { gn_args += is_debug=true gn_args += use_debug_fission=false - # MSVC requires iterator debug to always match and Qt has leaves it default on. + # MSVC requires iterator debug to always match and Qt leaves it default on. msvc: gn_args += enable_iterator_debugging=true + + # We also can not have optimized V8 binaries for MSVC as iterator debugging + # would mismatch. + msvc|v8base_debug: gn_args += v8_optimized_debug=false } -!webcore_debug: gn_args += remove_webcore_debug_symbols=true +!webcore_debug: gn_args += blink_symbol_level=0 !v8base_debug: gn_args += remove_v8base_debug_symbols=true # Compiling with -Os makes a huge difference in binary size diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index e45273cca..40bc0b73c 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -17,6 +17,7 @@ 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 \ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index e49df90e7..3f2fe9c0a 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -24,6 +24,7 @@ system("$${QMAKE_CLANG_PATH} --version") gn_args += \ is_clang=true \ use_sysroot=false \ + use_system_xcode=true \ clang_base_path=\"$${QMAKE_CLANG_DIR}\" \ clang_use_chrome_plugins=false \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ |