summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 13:34:20 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 13:48:51 +0000
commitdde9b55a24a364c5fede0d6c874890acb0251386 (patch)
tree29aede243473f043fa6630431f827a575c4a8f7b /recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
parente0a4e23c1dbeed88962694263de1776b530f3899 (diff)
downloadmeta-qt5-dde9b55a24a364c5fede0d6c874890acb0251386.tar.gz
qt5: refresh the patches and update them on meta-qt5 repositories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch6
1 files changed, 3 insertions, 3 deletions
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 13e0dc9b..c87537c9 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 @@
1From e0d8fe57a8bbd1c24ae35d93c54ab0c6e58eff20 Mon Sep 17 00:00:00 2001 1From 18a18b46eea62c7c58f78a7ee2c3c936d0d34c85 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
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e3..70161c8 100644 21index dd0d3e32..70161c82 100644
22--- a/src/buildtools/configure_host.pro 22--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 23+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 24@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -57,7 +57,7 @@ index dd0d3e3..70161c8 100644
57 " nm = \"$$which(nm)\" " \ 57 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 58 " toolchain_args = { " \
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 68d64fd..9ab43df 100644 60index 68d64fd4..9ab43df1 100644
61--- a/src/core/config/linux.pri 61--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 62+++ b/src/core/config/linux.pri
63@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { 63@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") {