summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-01-16 12:47:51 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-16 14:21:42 +0000
commitce766374432309b85fdcfe8ef287dbb2ef11b337 (patch)
treef82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
parent229f819b97e653399455e7b1d491de5ea49d5ba5 (diff)
downloadmeta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch6
1 files changed, 3 insertions, 3 deletions
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 610299d2..cf239a29 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 @@
1From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001 1From 642496d2ecd9b322c5b2e68ba9d9190c999d1d56 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index afeb4f3d1d..aec5253c25 100644 13index 1ba9676..5b5bcdf 100644
14--- a/mkspecs/features/qt_configure.prf 14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf 15+++ b/mkspecs/features/qt_configure.prf
16@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1238,7 +1238,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }