diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
tree | 377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | |
parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
download | meta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
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 | 6 |
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..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 e0d8fe57a8bbd1c24ae35d93c54ab0c6e58eff20 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 |
@@ -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 | ||
20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
21 | index dd0d3e3..70161c8 100644 | 21 | index 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 = { " \ |
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 68d64fd..9ab43df 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") { |