diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-07-19 14:12:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-11 17:25:32 +0000 |
| commit | 7282fb4fb4861320539f2b7288f63e1d4f48749d (patch) | |
| tree | 3fb62ed4d45875be975410b08c776888803748ec /src/core/config | |
| parent | 82499104972d24027044acaff1136ea7d758efe2 (diff) | |
Adaptations for Chromium 60
Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 7 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 3 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 15 |
3 files changed, 21 insertions, 4 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 8c06b9b35..ce7364ff9 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -4,11 +4,10 @@ gn_args += \ use_qt=true \ is_component_build=false \ is_shared=true \ - enable_media_router=false \ enable_nacl=false \ enable_remoting=false \ enable_web_speech=false \ - use_experimental_allocator_shim=false \ + use_allocator_shim=false \ use_allocator=\"none\" \ v8_use_external_startup_data=false \ treat_warnings_as_errors=false \ @@ -56,6 +55,10 @@ CONFIG(release, debug|release) { } } +CONFIG(debug, debug|release) { + gn_args += use_debug_fission=false +} + !webcore_debug: gn_args += remove_webcore_debug_symbols=true !v8base_debug: gn_args += remove_v8base_debug_symbols=true diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 28278e903..ee410bdde 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -122,8 +122,9 @@ host_build { } qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true - qtConfig(system-png): gn_args += use_system_libpng=true + use?(system_libpng): gn_args += use_system_libpng=true qtConfig(system-jpeg): gn_args += use_system_libjpeg=true + qtConfig(system-freetype): gn_args += use_system_freetype=true use?(system_harfbuzz): gn_args += use_system_harfbuzz=true !use?(glib): gn_args += use_glib=false qtConfig(pulseaudio) { diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index f5dd4a9d3..f74e0bb85 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -7,12 +7,25 @@ gn_args += \ enable_session_service=false \ ninja_use_custom_environment_files=false \ is_multi_dll_chrome=false \ - use_incremental_linking=false \ win_linker_timing=true isDeveloperBuild() { 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) { + gn_args += \ + use_incremental_linking=true + } else { + gn_args += \ + use_incremental_linking=false + } +} else { + gn_args += \ + is_win_fastlink=false \ + use_incremental_linking=false } defineTest(usingMSVC32BitCrossCompiler) { |