diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-27 17:44:52 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-05 05:58:25 +0000 |
commit | e7aec5e219486e10d4145ddd25df4ee6bd7246c9 (patch) | |
tree | 863317d0681862784a144f617ed2ca312a7f7825 /recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch | |
parent | 7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3 (diff) | |
download | meta-qt5-e7aec5e219486e10d4145ddd25df4ee6bd7246c9.tar.gz |
qt5: update submodules
Update submodules, change from dev to 5.10 branch
Change-Id: Iaabd27a1b2db2a3d28d2f3d4377d1386a86646c2
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch new file mode 100644 index 00000000..098e2fa7 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 853fc888f38d6ad0e189ba54ef648abe0ff5bb60 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 28 Aug 2017 15:36:17 +0300 | ||
4 | Subject: [PATCH] Disable unnamed tmp files | ||
5 | |||
6 | qmake does not work together with pseudo when unnamed temporary files | ||
7 | (O_TMPFILE) are used. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | [YOCTO #11996] | ||
11 | Change-Id: I9be92312c3e9a80438c1dc01344cb1ad721ad466 | ||
12 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
13 | --- | ||
14 | src/corelib/io/qtemporaryfile_p.h | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h | ||
18 | index 46a0d7a..3b418c9 100644 | ||
19 | --- a/src/corelib/io/qtemporaryfile_p.h | ||
20 | +++ b/src/corelib/io/qtemporaryfile_p.h | ||
21 | @@ -58,7 +58,7 @@ | ||
22 | #include "private/qfile_p.h" | ||
23 | #include "qtemporaryfile.h" | ||
24 | |||
25 | -#ifdef Q_OS_LINUX | ||
26 | +#if 0 | ||
27 | # include <fcntl.h> | ||
28 | # ifdef O_TMPFILE | ||
29 | // some early libc support had the wrong values for O_TMPFILE | ||