diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch')
| -rw-r--r-- | meta/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/meta/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch deleted file mode 100644 index 2e261b813e..0000000000 --- a/meta/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6cd8e808e0eb8fa26976da66dd3dfdd58c1d026a Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 24 Oct 2016 09:45:18 +0300 -Subject: [PATCH] Disable all unknown features instead of erroring out - -Task-number: QTBUG-56656 -Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 ---- - mkspecs/features/qt_configure.prf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index d5dcda2..501151d 100644 ---- a/mkspecs/features/qt_configure.prf -+++ b/mkspecs/features/qt_configure.prf -@@ -1251,7 +1251,8 @@ defineReplace(qtConfEvaluateSingleExpression) { - error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") - return($$result) - } -- error("Unknown feature object $${feature} in expression '$${1}'.") -+ warning("Unknown feature object $${feature} in expression '$${1}'.") -+ result = false - } - !qtConfCheckFeature($$feature): \ - error("Expression '$$1' is accessing non-emitted feature $${feature}.") |