diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-17 23:32:56 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-18 23:04:41 +0000 |
| commit | e2707a016c3475c167a421c9c73d88f81cc61bd1 (patch) | |
| tree | e4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | |
| parent | 07784245c1822766d54405d835ac2dc08652df1a (diff) | |
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
qtknx_git.bb:# v5.12.3 tag wasn't created yet
qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
qtopcua_git.bb:# v5.12.3 tag wasn't created yet
* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch
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.patch | 6 |
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 f00781a0..b54bcf64 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 85d21579a4c8ad92e776b40043b5f08b3ed0c48d Mon Sep 17 00:00:00 2001 +From 5556bc54942214e84dc5f81b2dcdc05f7713ff6e 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 @@ -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 7ca65c92b3..5d96071d8b 100644 +index 62ad972796..04690068bc 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1568,7 +1568,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1576,7 +1576,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } |