diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
commit | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (patch) | |
tree | edf25f5285e202a654be77201eb0e288f8b5bdb6 /recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch | |
parent | 201fcf27cf07d60b7d6ab89c7dcefe2190217745 (diff) | |
download | meta-qt5-c6be23d3b01b046d2142bb6fc017078f6154ddb5.tar.gz |
qt5: upgrade to latest revision in 5.12
* WIP: only qtbase now
* fixes #136
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 6e5aa3e1..0369e52c 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 @@ | |||
1 | From 374bf57efe5f936ab61811f7c433c870cdae77ab Mon Sep 17 00:00:00 2001 | 1 | From 68a9d70b13773587c7be0f5dad1829e4081749d1 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 | 3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 |
4 | Subject: [PATCH] Disable all unknown features instead of erroring out | 4 | Subject: [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 | ||
12 | diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf | 12 | diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf |
13 | index 4039bba431..153edbfa30 100644 | 13 | index fe14ea1f40..1ee89bac46 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 | @@ -1266,7 +1266,8 @@ defineReplace(qtConfEvaluateSingleExpression) { | 16 | @@ -1520,7 +1520,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 | } |