diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | |
parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) | |
download | meta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch new file mode 100644 index 00000000..8538901f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 | ||
4 | Subject: [PATCH] Disable all unknown features instead of erroring out | ||
5 | |||
6 | Task-number: QTBUG-56656 | ||
7 | Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 | ||
8 | --- | ||
9 | mkspecs/features/qt_configure.prf | 3 ++- | ||
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf | ||
13 | index 966c43108c..32f0dd0041 100644 | ||
14 | --- a/mkspecs/features/qt_configure.prf | ||
15 | +++ b/mkspecs/features/qt_configure.prf | ||
16 | @@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) { | ||
17 | error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") | ||
18 | return($$result) | ||
19 | } | ||
20 | - error("Unknown feature object $${feature} in expression '$${1}'.") | ||
21 | + warning("Unknown feature object $${feature} in expression '$${1}'.") | ||
22 | + result = false | ||
23 | } | ||
24 | !qtConfCheckFeature($$feature): \ | ||
25 | error("Expression '$$1' is accessing non-emitted feature $${feature}.") | ||