From 44538bd408cc7d82b858146b759024f5e38e64cc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 4 Jul 2018 10:20:19 +0300 Subject: Upgrade to Qt 5.12.0 Change-Id: I83beaa146a88bf6138e11c87a3308db38d9afd34 Reviewed-by: Mikko Gronoff --- ...-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch | 10 +++++----- .../0002-chromium-workaround-for-too-long-.rps-file-name.patch | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine') diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch index 0b79599d..7cd441e6 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch @@ -1,4 +1,4 @@ -From 9e8b0fda6b2338feed486d238a61c2a51e4fd2b3 Mon Sep 17 00:00:00 2001 +From 2bf22a3bf04617f21497f80184bd038e11bc8b0d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jun 2018 10:26:17 +0000 Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone @@ -36,15 +36,15 @@ Signed-off-by: Christophe Chapuis 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp -index 8f6687ff..994e2799 100644 +index f3b7d389..915d38fb 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp -@@ -159,7 +159,7 @@ std::unique_ptr GetFontList_SlowBlocking() +@@ -134,7 +134,7 @@ std::unique_ptr GetFontList_SlowBlocking() return std::move(font_list); } --#if BUILDFLAG(ENABLE_PLUGINS) -+#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE) +-#if QT_CONFIG(webengine_pepper_plugins) ++#if QT_CONFIG(webengine_pepper_plugins) && !defined(USE_OZONE) // content/browser/renderer_host/pepper/pepper_truetype_font_list.h void GetFontFamilies_SlowBlocking(std::vector *font_families) { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch index b5c6c5de..2b30ef4e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -30,7 +30,7 @@ index bab07c5d2b..8f889aebc1 100644 + //please note ".$unique_name" is not used at the moment + int pos = 0; + std::string delimiter("_"); -+ while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos) ++ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos) + rspfile = rspfile.substr(0,pos); + if (!target_->sources().empty()) -- cgit v1.2.3-54-g00ecf