4 files changed, 42 insertions, 17 deletions

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index c8c3d55f6..6f3ce75b3 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -4,6 +4,7 @@ QT_FOR_CONFIG += webenginecore
 
 gn_args += \
     use_qt=true \
+    closure_compile=false \
     is_component_build=false \
     is_shared=true \
     enable_message_center=false \
@@ -11,15 +12,20 @@ gn_args += \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
+    enable_swiftshader=false \
+    enable_web_auth=false \
     enable_web_speech=false \
     enable_widevine=true \
     has_native_accessibility=false \
+    enable_debugallocation=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
+    use_custom_libcxx=false \
     v8_use_external_startup_data=false \
+    toolkit_views=false \
     treat_warnings_as_errors=false \
-    enable_swiftshader=false \
-    use_custom_libcxx=false
+    safe_browsing_mode=0 \
+    optimize_webui=false
 
 !win32: gn_args += \
     use_jumbo_build=true \
@@ -49,11 +55,17 @@ qtConfig(webengine-spellchecker) {
 qtConfig(webengine-webrtc) {
     gn_args += enable_webrtc=true
 } else {
-    gn_args += enable_webrtc=false
+    gn_args += enable_webrtc=false audio_processing_in_audio_service_supported=false
 }
 
 qtConfig(webengine-proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
+qtConfig(webengine-extensions) {
+    gn_args += enable_extensions=true
+} else {
+    gn_args += enable_extensions=false
+}
+
 precompile_header {
     gn_args += enable_precompiled_headers=true
 } else {
@@ -81,6 +93,8 @@ 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: gn_args += enable_iterator_debugging=true
 }
 
 !webcore_debug: gn_args += remove_webcore_debug_symbols=true
@@ -91,7 +105,6 @@ optimize_size: gn_args += optimize_for_size=true
 
 # We don't want to apply sanitizer options to the build tools (GN, dict convert, etc).
 !host_build {
-    sanitizer: gn_args += sanitizer_keep_symbols=true
     sanitize_address: gn_args += is_asan=true
     sanitize_thread: gn_args += is_tsan=true
     sanitize_memory: gn_args += is_msan=true
@@ -112,5 +125,3 @@ qtConfig(webengine-kerberos) {
 } else {
     gn_args += use_kerberos=false
 }
-
-!msvc: gn_args += enable_iterator_debugging=false
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index e75764239..e45273cca 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -22,15 +22,19 @@ gn_args += \
     ozone_auto_platforms=false \
     ozone_platform_headless=false \
     ozone_platform_external=true \
-    ozone_platform=\"qt\"
+    ozone_platform=\"qt\" \
+    ozone_extra_path=\"$$QTWEBENGINE_ROOT/src/core/ozone/ozone_extra.gni\"
 
 qtConfig(webengine-embedded-build) {
     gn_args += is_desktop_linux=false
-    gn_args += use_gold=false
-} else {
-    !use_gold_linker: gn_args += use_gold=false
 }
 
+use_gold_linker: gn_args += use_gold=true
+else: gn_args += use_gold=false
+
+use_lld_linker: gn_args += use_lld=true
+else: gn_args += use_lld=false
+
 clang {
     clang_full_path = $$which($${QMAKE_CXX})
     # Remove the "/bin/clang++" part.
@@ -38,8 +42,8 @@ clang {
     gn_args += \
         is_clang=true \
         clang_use_chrome_plugins=false \
-        clang_base_path=\"$${clang_prefix}\" \
-        use_lld=false
+        clang_use_default_sample_profile=false \
+        clang_base_path=\"$${clang_prefix}\"
 
     linux-clang-libc++: gn_args += use_libcxx=true
 } else {
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 4426901cf..e49df90e7 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -28,8 +28,6 @@ gn_args += \
     clang_use_chrome_plugins=false \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
     mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
-    mac_views_browser=false \
-    toolkit_views=false \
     use_external_popup_menu=false
 
 qtConfig(webengine-spellchecker) {
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 730b38a35..385faeed0 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -1,7 +1,6 @@
 include(common.pri)
 
 gn_args += \
-    is_clang=false \
     use_sysroot=false \
     enable_session_service=false \
     ninja_use_custom_environment_files=false \
@@ -9,6 +8,20 @@ gn_args += \
     win_linker_timing=true \
     com_init_check_hook_disabled=true
 
+clang_cl {
+    clang_full_path = $$system_path($$which($${QMAKE_CXX}))
+    # Remove the "\bin\clang-cl.exe" part:
+    clang_dir = $$dirname(clang_full_path)
+    clang_prefix = $$join(clang_dir,,,"\..")
+    gn_args += \
+        is_clang=true \
+        use_ldd=true \
+        clang_use_chrome_plugins=false \
+        clang_base_path=\"$$system_path($$clean_path($$clang_prefix))\"
+} else {
+    gn_args += is_clang=false use_lld=false
+}
+
 isDeveloperBuild() {
     gn_args += \
         is_win_fastlink=true
@@ -71,7 +84,6 @@ msvc {
 
     GN_TARGET_CPU = $$gnArch($$QT_ARCH)
     gn_args += target_cpu=\"$$GN_TARGET_CPU\"
-
 } else {
-    error("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler")
+    error("Qt WebEngine for Windows can only be built with a Microsoft Visual Studio C++ compatible compiler")
 }