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

Change-Id: Ie4cf1de4a15398188b5e27b241154ec9271359dd

3 files changed, 13 insertions, 8 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 17e4aafb6fe894047b46abeb3c3b8290de4094c
+Subproject f0775ea93ab66f0676993db1633c9098dfb3a3a
diff --git a/src/buildtools/buildtools.pro b/src/buildtools/buildtools.pro
index 8985bbb25..1366d18d5 100644
--- a/src/buildtools/buildtools.pro
+++ b/src/buildtools/buildtools.pro
@@ -1,12 +1,5 @@
 TEMPLATE = subdirs
 
-ninja.file = ninja.pro
-SUBDIRS += ninja
-
-gn.file = gn.pro
-gn.depends = ninja
-SUBDIRS += gn
-
 linux {
     # configure_host.pro and configure_target.pro are phony pro files that
     # extract things like compiler and linker from qmake.
@@ -18,3 +11,10 @@ linux {
 
     SUBDIRS += configure_host configure_target
 }
+
+ninja.file = ninja.pro
+SUBDIRS += ninja
+
+gn.file = gn.pro
+gn.depends = ninja
+SUBDIRS += gn
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 886ebe83d..60aba490c 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -6,13 +6,16 @@ gn_args += \
     is_shared=true \
     enable_nacl=false \
     enable_remoting=false \
+    enable_reporting=false \
     enable_web_speech=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
     v8_use_external_startup_data=false \
     treat_warnings_as_errors=false \
     enable_swiftshader=false \
-    use_custom_libcxx=false \
+    use_custom_libcxx=false
+
+!win32: gn_args += \
     use_jumbo_build=true \
     jumbo_file_merge_limit=50
 
@@ -44,6 +47,8 @@ qtConfig(webengine-webrtc) {
 
 qtConfig(webengine-proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
+!precompile_header: gn_args += disable_precompiled_headers=true
+
 CONFIG(release, debug|release) {
     force_debug_info {
         # Level 1 is not enough to generate all Chromium debug symbols on Windows