From 95974f44f18c9e0c1e52391d0a7da255b3bb1332 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 4 Apr 2019 11:47:26 +0000 Subject: qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks Signed-off-by: Martin Jansa --- .../0005-Disable-all-unknown-features-instead-of-erroring-out.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch') 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 index 9b563b26..f00781a0 100644 --- 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 @@ -1,4 +1,4 @@ -From af450d151f0f9329fb207b7f06bbaa72d97aad0f Mon Sep 17 00:00:00 2001 +From 85d21579a4c8ad92e776b40043b5f08b3ed0c48d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 81b820978a..bec0fb1149 100644 +index 7ca65c92b3..5d96071d8b 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1301,7 +1301,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1568,7 +1568,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } -- cgit v1.2.3-54-g00ecf