Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	src/3rdparty
	src/core/certificate_error_controller.cpp
	src/core/certificate_error_controller.h
	src/core/compositor/compositor.cpp
	src/core/compositor/compositor.h
	src/core/compositor/display_gl_output_surface.cpp
	src/core/content_browser_client_qt.cpp
	src/core/core_chromium.pri
	src/core/delegated_frame_host_client_qt.cpp
	src/core/ozone/gl_share_context_qt.h
	src/core/ozone/surface_factory_qt.cpp
	src/core/permission_manager_qt.cpp
	src/core/render_widget_host_view_qt.cpp
	src/core/render_widget_host_view_qt.h
	src/core/web_engine_context.cpp
	src/core/web_engine_settings.cpp
	src/core/web_event_factory.cpp
	tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp

Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669

4 files changed, 26 insertions, 15 deletions

diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index ddcd225cc..85781d251 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -5,7 +5,7 @@ QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private
 
 gn_args += \
     use_qt=true \
-    closure_compile=false \
+    init_stack_vars=false \
     is_component_build=false \
     is_shared=true \
     enable_debugallocation=false \
@@ -20,17 +20,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 += \
@@ -53,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/linking.pri b/src/buildtools/config/linking.pri
index e4f40ba71..e76f6ef10 100644
--- a/src/buildtools/config/linking.pri
+++ b/src/buildtools/config/linking.pri
@@ -25,28 +25,31 @@ for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive
 write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT)
 
 if(macos|ios) {
-    QMAKE_LFLAGS += -Wl,-filelist,$$shell_quote($${RSP_OBJECT_FILE})
     !static {
+        QMAKE_LFLAGS += -Wl,-filelist,$$shell_quote($${RSP_OBJECT_FILE})
         QMAKE_LFLAGS += @$${RSP_ARCHIVE_FILE}
     } else {
+        OBJECTS += $$NINJA_OBJECTS
         LIBS_PRIVATE += $${NINJA_ARCHIVES}
     }
 }
 
 linux {
-    QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
     !static {
+        QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
         QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group
     } else {
+        OBJECTS += $$NINJA_OBJECTS
         LIBS_PRIVATE += -Wl,--start-group @$${NINJA_ARCHIVES} -Wl,--end-group
     }
 }
 
 win32 {
-    QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
     !static {
+        QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
         QMAKE_LFLAGS += @$${RSP_ARCHIVE_FILE}
     } else {
+        OBJECTS += $$NINJA_OBJECTS
         LIBS_PRIVATE += $${NINJA_ARCHIVES}
     }
 }
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
 }