diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-12 13:07:23 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-18 10:22:32 +0000 |
commit | 57a6353c8ad25d68192bfb22b3f7f3f0ca1241a4 (patch) | |
tree | da6137b2e6982b90e3879b140b831d87f9e8338a /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | 270fb283c271f24eee7d9f5b45ff29066865b923 (diff) | |
download | meta-qt5-57a6353c8ad25d68192bfb22b3f7f3f0ca1241a4.tar.gz |
qt5: update submodulesv5.13.0-beta1
* Update to Qt 5.13.0 Beta1
* QtCanvas3D recipe removed as the module has been removed from Qt 5.13
* New recipe added for QtLottie
Task-number: QTBUG-72311
Change-Id: Ib5eb563f94c01149a50a6cec9d61c9de6571be6a
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 | 12 |
1 files changed, 6 insertions, 6 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 54480b77..544e5ebe 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 @@ | |||
1 | From 8a07ea88666132e3ca944d0d5784235420c3d382 Mon Sep 17 00:00:00 2001 | 1 | From 4bd5ee8a79729c29795568568a9cd7a01d9c338b 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 |
@@ -58,7 +58,7 @@ index dd0d3e3..6312c86 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 58 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 59 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index 7766af0..9d578c8 100644 | 61 | index 30ada93..afd115c 100644 |
62 | --- a/src/buildtools/gn.pro | 62 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 63 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { |
@@ -66,12 +66,12 @@ index 7766af0..9d578c8 100644 | |||
66 | 66 | ||
67 | gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ | 67 | gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ |
68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ | 68 | - --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ |
69 | - --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\" | 69 | - --ld \"$$which($$QMAKE_LINK)\" |
70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ | 70 | + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ |
71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" | 71 | + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" |
72 | message($$gn_configure) | 72 | macos { |
73 | !system("$$pythonPathForSystem() $$gn_configure") { | 73 | gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" |
74 | error("GN generation error!") | 74 | } |
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
76 | index 04c9eca..c48fa06 100644 | 76 | index 04c9eca..c48fa06 100644 |
77 | --- a/src/core/config/linux.pri | 77 | --- a/src/core/config/linux.pri |