diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-19 15:27:44 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-21 15:31:15 +0000 |
| commit | ed327d9cd97c0996e0875b0c03f86cbd76232977 (patch) | |
| tree | 1b1b89d8617badc2e4a9b35af4d3472613b06a12 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
| parent | 282f531e63961300be055665acc454356de889fa (diff) | |
qt5: update submodules
Update to latest content in Qt 5.13 branch
Task-number: QTBUG-72311
Change-Id: If99527ca97867b99d5273e229d7e98a6cd149f5e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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.patch | 26 |
1 files changed, 21 insertions, 5 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 b51c4c72..1aaf9498 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 @@ -From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001 +From 376b5b262f2ed936920a66167b76edab781ddcff Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -14,11 +14,12 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> --- src/buildtools/configure_host.pro | 14 +++++++------- + src/buildtools/gn.pro | 4 ++-- src/core/config/linux.pri | 2 +- - 2 files changed, 8 insertions(+), 8 deletions(-) + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..70161c82 100644 +index dd0d3e3..70161c8 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -56,11 +57,26 @@ index dd0d3e32..70161c82 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ +diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro +index 7766af0..46defa6 100644 +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -19,8 +19,8 @@ build_pass|!debug_and_release { + gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) + + gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ +- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ +- --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\" ++ --cc \"$$which(gcc)\" --cxx \"$$which(g++)\" \ ++ --ld \"$$which(g++)\" --ar \"$$which(ar)\" + message($$gn_configure) + !system("$$pythonPathForSystem() $$gn_configure") { + error("GN generation error!") diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 85b948db..c529c641 100644 +index 04c9eca..c48fa06 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { +@@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |