summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-10-20 14:22:57 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-10-27 12:46:53 +0000
commitf3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6 (patch)
treecf92f4b22809a47415e30a9d405d232cd7214ddc /recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch
parent429a8e9a0b720b2ca1e66fff921888bbdef3e378 (diff)
downloadmeta-qt5-f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6.tar.gz
qt5: update submodules
Add more PACKAGECONFIGs for qtbase. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk). Previous workaround removed and new ones added for: QTBUG-56656, QTBUG-56666 Reduce number of patches applied to qtbase. Change-Id: I6b82fd46aaade4f14cf61e29adb7fc984070333b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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.patch28
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 @@
1From 9eb81e3bdeda4f90e5f2942400aef38b51a356bd Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out
5
6Task-number: QTBUG-56656
7Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
8---
9 mkspecs/features/qt_configure.prf | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index 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--
271.9.1
28