summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
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.patch8
1 files changed, 4 insertions, 4 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 7bda76a2..6b3f6ba6 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 f3f2b6b42d546280a17169ea340d8bef82496516 Mon Sep 17 00:00:00 2001 1From cdadaf40267c81ff730e90798cf486b35bb20758 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 998aedc..b04db36 100644 22index ee08f81b..297a6862 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@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") { 25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
@@ -32,7 +32,7 @@ index 998aedc..b04db36 100644
32 # Don't bother trying to use system libraries in this case 32 # Don't bother trying to use system libraries in this case
33 gn_args += use_glib=false 33 gn_args += use_glib=false
34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
35index dd0d3e3..6312c86 100644 35index dd0d3e32..6312c867 100644
36--- a/src/buildtools/configure_host.pro 36--- a/src/buildtools/configure_host.pro
37+++ b/src/buildtools/configure_host.pro 37+++ b/src/buildtools/configure_host.pro
38@@ -4,7 +4,7 @@ TEMPLATE = aux 38@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -71,7 +71,7 @@ index dd0d3e3..6312c86 100644
71 " nm = \"$$which(nm)\" " \ 71 " nm = \"$$which(nm)\" " \
72 " toolchain_args = { " \ 72 " toolchain_args = { " \
73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
74index 033202e..a8ca656 100644 74index 033202e6..a8ca6567 100644
75--- a/src/buildtools/gn.pro 75--- a/src/buildtools/gn.pro
76+++ b/src/buildtools/gn.pro 76+++ b/src/buildtools/gn.pro
77@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 77@@ -19,8 +19,8 @@ build_pass|!debug_and_release {