diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-16 22:57:15 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-17 20:42:43 +0200 |
commit | d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8 (patch) | |
tree | 59316aab5eb11a92368160769ef78545ddab5dfd /recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch | |
parent | 1619723dfc0cdc831b71bf7ab09c4227ea544255 (diff) | |
download | meta-qt5-d82317c23d6473a4e53d7a5ff11ecf6b9c8769e8.tar.gz |
qtbase: refresh the patches
* upload the patches to b5.8* branches on:
https://github.com/meta-qt5/qtbase
* refresh the patches
* notice that some patches were in section which is meant to be
common for target, native and nativesdk qtbase but were added
only in target recipe, I've updated them to be included in all
3, hopefully they can be used in all 3 (I don't use nativesdk at all)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch new file mode 100644 index 00000000..c2b44381 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 8acdd69a4083080f4dd40001eee30209ec5de0b2 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 eaaa161270..fa3addae11 100644 | ||
14 | --- a/mkspecs/features/qt_configure.prf | ||
15 | +++ b/mkspecs/features/qt_configure.prf | ||
16 | @@ -1035,7 +1035,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}.") | ||