diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 08:37:18 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (patch) | |
tree | ada273f12808c8c1ed9e4585638c63d93d8363a4 /recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | |
parent | 3e7da25564d74195610adede9391ca733a0a1412 (diff) | |
download | meta-qt5-f9e80edff01159375b6e03f3cb9ea1f8ed5ced79.tar.gz |
qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 4f5fdc95..00000000 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | ||
4 | Subject: [PATCH] Bootstrap without linkat feature | ||
5 | |||
6 | qmake does not work together with pseudo when unnamed temporary files | ||
7 | are used with linkat. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | [YOCTO #11996] | ||
11 | --- | ||
12 | src/corelib/global/qconfig-bootstrapped.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | ||
16 | index c5585ea32a..de895e7bf4 100644 | ||
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
19 | @@ -90,7 +90,7 @@ | ||
20 | #define QT_FEATURE_itemmodel -1 | ||
21 | #define QT_FEATURE_library -1 | ||
22 | #ifdef __linux__ | ||
23 | -# define QT_FEATURE_linkat 1 | ||
24 | +# define QT_FEATURE_linkat -1 | ||
25 | #else | ||
26 | # define QT_FEATURE_linkat -1 | ||
27 | #endif | ||