diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 17:02:29 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 17:33:38 +0200 |
commit | 9c7507ef155d9c248b6d9b12349c52fa1410e482 (patch) | |
tree | af4e914fe7582afcdf38fcf9223ea4e429fd1513 /recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |
parent | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (diff) | |
download | meta-qt5-9c7507ef155d9c248b6d9b12349c52fa1410e482.tar.gz |
qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch index 142595a3..258afd53 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 | 1 | From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
13 | 1 file changed, 6 insertions(+), 6 deletions(-) | 13 | 1 file changed, 6 insertions(+), 6 deletions(-) |
14 | 14 | ||
15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 15 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
16 | index fd27643e..f9acb6ff 100644 | 16 | index f1b3d47b..521c507b 100644 |
17 | --- a/src/buildtools/configure_host.pro | 17 | --- a/src/buildtools/configure_host.pro |
18 | +++ b/src/buildtools/configure_host.pro | 18 | +++ b/src/buildtools/configure_host.pro |
19 | @@ -28,9 +28,9 @@ GN_CONTENTS = \ | 19 | @@ -29,9 +29,9 @@ GN_CONTENTS = \ |
20 | "import(\"//build/config/sysroot.gni\")" \ | 20 | "import(\"//build/config/sysroot.gni\")" \ |
21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ | 21 | "import(\"//build/toolchain/gcc_toolchain.gni\")" \ |
22 | "gcc_toolchain(\"host\") {" \ | 22 | "gcc_toolchain(\"host\") {" \ |
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644 | |||
29 | " ar = \"$$which(ar)\" " \ | 29 | " ar = \"$$which(ar)\" " \ |
30 | " nm = \"$$which(nm)\" " \ | 30 | " nm = \"$$which(nm)\" " \ |
31 | " toolchain_args = { " \ | 31 | " toolchain_args = { " \ |
32 | @@ -41,9 +41,9 @@ GN_CONTENTS = \ | 32 | @@ -42,9 +42,9 @@ GN_CONTENTS = \ |
33 | " } " \ | 33 | " } " \ |
34 | "}" \ | 34 | "}" \ |
35 | "gcc_toolchain(\"v8_snapshot\") {" \ | 35 | "gcc_toolchain(\"v8_snapshot\") {" \ |