From f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 08:37:18 +0000 Subject: qt5: update to latest revision in 5.11 branch * drop nobranch=1 again * update the branches and tags on meta-qt5/qt* forks and the tag name in recipes * use latest revision in 5.11 branch instead of 5.11.2 which might be removed again Signed-off-by: Martin Jansa --- .../qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch') diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch index eaed7a6c..649c7447 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From a7eff4032f84490b33df27771d43e098ceea439e Mon Sep 17 00:00:00 2001 +From 9e88d83104e8d3c5b093e52c9af9829092b79148 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -57,10 +57,10 @@ index dd0d3e32..70161c82 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index b56134ad..69f463e9 100644 +index 4ade2827..cad3d7bf 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { +@@ -92,7 +92,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" -- cgit v1.2.3-54-g00ecf