diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-21 19:34:01 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-22 14:35:29 +0000 |
commit | ef5f5d912da50e43015de0e7fecb482a7cd4a2fd (patch) | |
tree | 8f89fe21421a93ffd0141c5743d1cd67d4961bcd /recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | |
parent | 820f3ef827b874340e9e42000657a110c9a99440 (diff) | |
download | meta-qt5-ef5f5d912da50e43015de0e7fecb482a7cd4a2fd.tar.gz |
qt5: upgrade to 5.11.1
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.patch | 4 |
1 files changed, 2 insertions, 2 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 c87537c9..eaed7a6c 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 @@ | |||
1 | From 18a18b46eea62c7c58f78a7ee2c3c936d0d34c85 Mon Sep 17 00:00:00 2001 | 1 | From a7eff4032f84490b33df27771d43e098ceea439e 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 |
@@ -57,7 +57,7 @@ index dd0d3e32..70161c82 100644 | |||
57 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
58 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
60 | index 68d64fd4..9ab43df1 100644 | 60 | index b56134ad..69f463e9 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") { |