qt5: update submodules

Update to latest content in Qt 5.15 branch.

Task-number: QTBUG-80823
Change-Id: I5230d9fea7ee8d0cb3227e77d62c93ae0cd921b3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

3 files changed, 15 insertions, 15 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 2fdb0d82..bd16cee2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From 4b16ad982ff10945a37a7dd90735a5a1be3d6a8b Mon Sep 17 00:00:00 2001
+From 37648db3a564bc4bdcecfc2a38bc21d45875088e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,17 +10,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
-index 5763432aa4f..ff00b7307c0 100644
+index 044bd8d244f..cec43e1d59b 100644
 --- a/chromium/base/process/process_metrics_posix.cc
 +++ b/chromium/base/process/process_metrics_posix.cc
-@@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
    malloc_statistics_t stats = {0};
    malloc_zone_statistics(nullptr, &stats);
    return stats.size_in_use;
 -#elif defined(OS_LINUX) || defined(OS_ANDROID)
 +#elif defined(__GLIBC__) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
- #if defined(USE_TCMALLOC)
+ #if BUILDFLAG(USE_TCMALLOC)
    return minfo.uordblks;
  #else
    return minfo.hblkhd + minfo.arena;
@@ -31,7 +31,7 @@ index 5763432aa4f..ff00b7307c0 100644
    return 0;
  #endif
 diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
-index 0077d8b0aec..c69f893f4e9 100644
+index 7e42cfc20bb..4e24fc711ad 100644
 --- a/chromium/base/trace_event/malloc_dump_provider.cc
 +++ b/chromium/base/trace_event/malloc_dump_provider.cc
 @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -42,7 +42,7 @@ index 0077d8b0aec..c69f893f4e9 100644
    {
      base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
      if (!emit_metrics_on_memory_dump_)
-@@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
                            MemoryAllocatorDump::kUnitsBytes,
                            resident_size - allocated_objects_size);
    }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
index 2fdc4944..c5667e9d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From 04a11fa6f38987091b6b65244950d3d83579c9a8 Mon Sep 17 00:00:00 2001
+From b6ef8cafefad7082fd681ff8386835d7bebdb38c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
-index 5fb86467dde..9864858eb67 100644
+index 5ea77ef2d27..85343a13905 100644
 --- a/chromium/base/allocator/allocator_check.cc
 +++ b/chromium/base/allocator/allocator_check.cc
 @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
    // Set by allocator_shim_override_ucrt_symbols_win.h when the
    // shimmed _set_new_mode() is called.
    return g_is_win_shim_layer_initialized;
--#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
-+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
+-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
++#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
      !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
  // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
  // TODO(primiano): replace with an include once base can depend on allocator.
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 81d555f9..facc53d9 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
-From 59ab7f11b90bd2114ff8cc16d6502e0ad6bb6538 Mon Sep 17 00:00:00 2001
+From 2502151f355d0cc9d1c3681958df73c35010c145 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
-index e6838ebda84..7296cc9ed81 100644
+index ef42d5ad67f..626e4c996a5 100644
 --- a/chromium/base/allocator/allocator_shim.cc
 +++ b/chromium/base/allocator/allocator_shim.cc
-@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
+@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
  // In the case of tcmalloc we also want to plumb into the glibc hooks
  // to avoid that allocations made in glibc itself (e.g., strdup()) get
  // accidentally performed on the glibc heap instead of the tcmalloc one.
--#if defined(USE_TCMALLOC)
-+#if defined(USE_TCMALLOC) && defined(__GLIBC__)
+-#if BUILDFLAG(USE_TCMALLOC)
++#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
  #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
  #endif