diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-24 09:20:00 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-24 11:14:44 +0200 |
| commit | a09725171e6f7d339f9cc387435d464658dd6493 (patch) | |
| tree | d271823a38ad319365a7c16e3706feb97a1f45c3 /recipes-qt/qt5/qtwebengine | |
| parent | fcbebae5c89122c8b9434928532c43e477e43312 (diff) | |
qt5: update submodules
Update to latest content in lts-5.15.13 branch.
Task-number: QTBUG-109768
Change-Id: I2e761ae24dcf789bd69412eaaf317e78411cf365
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch index 4cb7c6ea..d0430dba 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch @@ -1,4 +1,4 @@ -From 03e9ff9a00ea85e84faeb6267d60fb9ed7c0a598 Mon Sep 17 00:00:00 2001 +From 56807e21eb47e3d2567f7772d37d5b19afe860fa Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 16 May 2022 20:01:49 +0000 Subject: [PATCH] chromium: skia: Fix build with gcc-12 @@ -49,7 +49,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp -index 7260365b2c6..cd07eb48650 100644 +index 0dc3497062f..f63f1800501 100644 --- a/chromium/third_party/skia/src/utils/SkParseColor.cpp +++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp @@ -7,6 +7,7 @@ @@ -58,5 +58,5 @@ index 7260365b2c6..cd07eb48650 100644 #include "include/utils/SkParse.h" +#include <vector> - static constexpr const char* gColorNames[] = { - "aliceblue", + #include <algorithm> // std::lower_bound + #include <iterator> |