diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-10 13:57:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:10 +0200 |
| commit | 455619d3875e0e0e7a03734806d61c7998735cd4 (patch) | |
| tree | 3e2558da4525819ad9bd5e46ee9f471c73aa8d5f /src/buildtools | |
| parent | cd61343ceb4a3de8ce16082917a2f197b2481d08 (diff) | |
Adaptations for Chromium 83
Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/common.pri | 3 | ||||
| -rw-r--r-- | src/buildtools/config/mac_osx.pri | 1 | ||||
| -rw-r--r-- | src/buildtools/config/windows.pri | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri index c184024e8..85781d251 100644 --- a/src/buildtools/config/common.pri +++ b/src/buildtools/config/common.pri @@ -5,6 +5,7 @@ QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private gn_args += \ use_qt=true \ + init_stack_vars=false \ is_component_build=false \ is_shared=true \ enable_debugallocation=false \ @@ -62,6 +63,8 @@ CONFIG(release, debug|release):!qtConfig(webengine-developer-build) { } else { gn_args += is_official_build=false !qtConfig(webengine-developer-build): gn_args += is_unsafe_developer_build=false + # Just doesn't work in many configurations: + gn_args += from_here_uses_location_builtins=false } CONFIG(release, debug|release) { diff --git a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri index a93460784..b53f91706 100644 --- a/src/buildtools/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri @@ -34,6 +34,5 @@ gn_args += \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \ use_external_popup_menu=false \ - init_stack_vars=false \ angle_enable_vulkan=false diff --git a/src/buildtools/config/windows.pri b/src/buildtools/config/windows.pri index c36534d19..bd236e1a5 100644 --- a/src/buildtools/config/windows.pri +++ b/src/buildtools/config/windows.pri @@ -7,7 +7,8 @@ gn_args += \ is_multi_dll_chrome=false \ win_linker_timing=true \ com_init_check_hook_disabled=true \ - heterogeneous_executables=true + heterogeneous_executables=true \ + enable_vr=false clang_cl { clang_full_path = $$system_path($$which($${QMAKE_CXX})) @@ -24,9 +25,6 @@ clang_cl { } qtConfig(webengine-developer-build) { - gn_args += \ - is_win_fastlink=true - # Incremental linking doesn't work in release developer builds due to usage of /OPT:ICF # by Chromium. CONFIG(debug, debug|release) { @@ -38,7 +36,6 @@ qtConfig(webengine-developer-build) { } } else { gn_args += \ - is_win_fastlink=false \ use_incremental_linking=false } |