summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-02-20 13:08:05 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-02-20 13:28:52 +0000
commit933e47e3fd524a9705c888351ceb8dd523395017 (patch)
treef9ef14adff00bacf6c62ab5b40d16866780c94d7 /recipes-qt/qt5/qtwebengine
parentbf26b39ccd957a786fa154ad90b5add00ba8c92f (diff)
downloadmeta-qt5-933e47e3fd524a9705c888351ceb8dd523395017.tar.gz
qt5: update submodules
Qt 5.11.0 Alpha Change-Id: I84a70966036a3c1764b6331f046779ec5b02617d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch b/recipes-qt/qt5/qtwebengine/0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch
deleted file mode 100644
index 60e2c564..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 7604806e71e6b7931b3ea06ed3aa9aae33ac5883 Mon Sep 17 00:00:00 2001
2From: Michal Klocek <michal.klocek@qt.io>
3Date: Thu, 8 Feb 2018 10:55:01 +0100
4Subject: [PATCH] Ignore PKG_CONFIG* shell exports for Yocto
5
6Yocto sets GN_HOST_PKG_CONFIG script for native
7tools builds, therefore skip host pkg-config script
8generation even if PKG_CONFIG* shell variables for target
9are exported.
10
11Task-number: QTBUG-66275
12Change-Id: I4a9939cd67ca5f32faeb827b5df0d3274ae7c30e
13Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
14---
15 src/core/config/linux.pri | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
19index d337f686..1ce3ea89 100644
20--- a/src/core/config/linux.pri
21+++ b/src/core/config/linux.pri
22@@ -115,12 +115,12 @@ host_build {
23 PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST)
24 pkgConfigLibDir = $$(PKG_CONFIG_LIBDIR)
25 pkgConfigSysrootDir = $$(PKG_CONFIG_SYSROOT_DIR)
26- isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST
27- cross_compile {
28+ isEmpty(PKG_CONFIG_HOST): cross_compile {
29 !isEmpty(pkgConfigLibDir)|!isEmpty(pkgConfigSysrootDir) {
30 PKG_CONFIG_HOST = $$pkgConfigHostExecutable()
31 }
32 }
33+ isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST
34 gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\"
35 }
36