diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch new file mode 100644 index 00000000..cb9de793 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 9eb81e3bdeda4f90e5f2942400aef38b51a356bd 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 e8fa0c6..0ca5670 100644 | ||
| 14 | --- a/mkspecs/features/qt_configure.prf | ||
| 15 | +++ b/mkspecs/features/qt_configure.prf | ||
| 16 | @@ -1009,7 +1009,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}.") | ||
| 26 | -- | ||
| 27 | 1.9.1 | ||
| 28 | |||
