diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-25 15:36:46 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-02-12 06:58:59 +0000 |
commit | 50c4963980164ae0e9992d652fd934d85fd2400e (patch) | |
tree | 2e1a1beb461e4ea3b793e87ee0d1583273eb20fa /recipes-qt/qt5/qtwebengine | |
parent | c907a6caee05b559ee231300a228f88708f9b7c2 (diff) | |
download | meta-qt5-50c4963980164ae0e9992d652fd934d85fd2400e.tar.gz |
qt5: Upgrade to Qt 5.11.0
QtQuickCompiler functionality is now integrated to qtdeclarative and can be
enabled with CONFIG+=qtquickcompiler. Add PACKAGECONFIG to qt5.inc, so that
any qtmodule can take advantage of this. Enable by default for qtcharts and
qtvirtualkeyboard.
Change-Id: I484b4b6c7869b3ca5630ef9685453aecc626137a
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.patch | 36 |
1 files changed, 36 insertions, 0 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 new file mode 100644 index 00000000..60e2c564 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Ignore-PKG_CONFIG-shell-exports-for-Yocto.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 7604806e71e6b7931b3ea06ed3aa9aae33ac5883 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michal Klocek <michal.klocek@qt.io> | ||
3 | Date: Thu, 8 Feb 2018 10:55:01 +0100 | ||
4 | Subject: [PATCH] Ignore PKG_CONFIG* shell exports for Yocto | ||
5 | |||
6 | Yocto sets GN_HOST_PKG_CONFIG script for native | ||
7 | tools builds, therefore skip host pkg-config script | ||
8 | generation even if PKG_CONFIG* shell variables for target | ||
9 | are exported. | ||
10 | |||
11 | Task-number: QTBUG-66275 | ||
12 | Change-Id: I4a9939cd67ca5f32faeb827b5df0d3274ae7c30e | ||
13 | Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> | ||
14 | --- | ||
15 | src/core/config/linux.pri | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | ||
19 | index 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 | |||