diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-03 15:01:08 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-15 13:58:40 +0000 |
commit | 8d2e1b401987d743ebdf964927c03f41e8f60328 (patch) | |
tree | d002364505c85ecb0a508dc359156c4444ffeaed /recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |
parent | 8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 (diff) | |
download | meta-qt5-8d2e1b401987d743ebdf964927c03f41e8f60328.tar.gz |
qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap
and qtlottie, and remove qtcanvas3d.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch deleted file mode 100644 index 4e901aa9..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From b0e6bada9d4da53204dffa7d9343f925c7d5603e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | ||
4 | Subject: [PATCH] chromium: Force host toolchain configuration | ||
5 | |||
6 | Force gcc/g++ to be used for parts using host toolchain, since | ||
7 | the option(host_build) does not work in yocto builds. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | gn/build/gen.py | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/gn/build/gen.py b/gn/build/gen.py | ||
17 | index 87db4c26bcf..34c853b7f4a 100755 | ||
18 | --- a/gn/build/gen.py | ||
19 | +++ b/gn/build/gen.py | ||
20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): | ||
21 | ld = os.environ.get('LD', 'g++') | ||
22 | ar = os.environ.get('AR', 'ar -X64') | ||
23 | else: | ||
24 | - cc = os.environ.get('CC', 'cc') | ||
25 | - cxx = os.environ.get('CXX', 'c++') | ||
26 | + cc = os.environ.get('CC_host', 'gcc') | ||
27 | + cxx = os.environ.get('CXX_host', 'g++') | ||
28 | ld = cxx | ||
29 | - ar = os.environ.get('AR', 'ar') | ||
30 | + ar = os.environ.get('AR_host', 'ar') | ||
31 | |||
32 | # QTBUG-64759 | ||
33 | # cflags = os.environ.get('CFLAGS', '').split() | ||