summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:22:21 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-05-27 15:54:32 +0200
commitb434031733b5fc0889ce89af669950f6b1cd9aa1 (patch)
tree8084e310049308bb58ab9a603508ca17c9b61c96 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parentcfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff)
downloadmeta-qt5-b434031733b5fc0889ce89af669950f6b1cd9aa1.tar.gz
qt5: upgrade to 5.15.0
* https://www.qt.io/blog/qt-5.15-released * continue to use latest revision in 5.15 (and 80-based) branch for qtwebengine, because we were already using newer than v5.15.0 revision and some of those fixes are needed for master (e.g. for build with gcc-10) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 9b5a96b2..31961d91 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 934acc13090f1d394a2f81a033d2901b42d3ef97 Mon Sep 17 00:00:00 2001 1From a6f536ce5753e95d2ecfd392ebc7deb37aceea09 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri 21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index c02af390..98af1d68 100644 22index 455a2e3c..6178d860 100644
23--- a/src/buildtools/config/linux.pri 23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri 24+++ b/src/buildtools/config/linux.pri
25@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") { 25@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {